6103b2a5e1
Fixes Spraycans not coloring faces correctly
...
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
73e4502a64
outer +/- hrefs in tank pressure gui change pressure by 5kPa instead of 10 now
2015-04-08 00:00:39 +02:00
af99eea983
okay
2015-04-07 18:57:30 +01:00
cb6bae5e52
-Defibs no longer have a minimum damage requirement. Previously the body required to be damaged in order to be defibbed (Required to be damaged, atleast 200 units). I can only assume that this was the case because the author had math that needed the body to have atleast 200 units of damage for it to work correctly, but I assume that the author naively thought it was impossible to heal corpses.
...
--Defibs now restore the health of the user to halfway between crit and death (-50 health or 150 sustained damage). If the user has little damage sustained, they will receive oxyloss to place them to the halfway point. If the corpse has more damage than the halfway point, they will be healed to the halfway point, in a ratio based on how much they sustained in each type of damage they took.
--Defibs will not heal cloneloss, and will still damage/heal the patient to the halfway point including the cloneless (eg a patient who is 0/0/0/0 with 30 cloneless receives 120 oxyloss). If the patient has too much cloneloss, they will heal fully, except they will still have the cloneloss (eg, they will be 0/0/0/0 with 180 cloneloss on revival)
--Additonal feedback given for some failure states for the defib.
2015-04-07 18:28:32 +08:00
8499413649
Makes living/verb/resist more object oriented.
...
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
1da595b535
Merge pull request #8737 from RemieRichards/NinjaCleanup2
...
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
cbbd5897ee
Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated.
2015-04-05 16:48:50 +02:00
f9f618d699
Adding the chemical reactions and recipes for the new recipes.
...
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
5e93f57873
Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so.
2015-04-04 18:17:37 +01:00
6d34032385
Merge pull request #8628 from Fayrik/AllTheSmallThings
...
Someone called for pest control?
2015-04-04 20:58:07 +11:00
8d2f92cdd3
Merge pull request #8683 from AnturK/pickets
...
Adds Picket Signs
2015-04-04 20:57:56 +11:00
20ed6aada5
Merge pull request #8668 from ACCount12/syndieboxes
...
Toolboxes & welders update
2015-04-04 20:57:15 +11:00
09c102cf9a
Update stunbaton.dm
2015-04-04 16:09:15 +13:00
de16628204
stun batons no longer lose charge over time
2015-04-04 16:06:59 +13:00
493c3e038a
Splitting food.dmi into smaller files.
...
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
3ff5980e85
- Adds Picket Signs
2015-04-02 18:23:17 +02:00
57e1274353
Merge pull request #8624 from Cheridan/day42_betsoff
...
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
cda61c1075
Welder&toolboxes update
2015-04-01 10:43:22 +12:00
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
9606763e5f
Merge pull request #8583 from Fayrik/CentcomExpansion
...
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
0cef9e5539
Merge pull request #8198 from Xhuis/cigar_cases
...
Adds cigar cases
2015-03-30 18:47:46 +02:00
9b834fca7a
Look at all these bugs that no longer exist!
2015-03-30 03:36:24 +01:00
884e9e3774
Day Who-Knows: Bar Gambling Expansion!
...
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
8113c2a1f0
Merge pull request #8483 from xxalpha/c4fix
...
Fixes the C4 being planted on the DA.
2015-03-30 01:21:52 +11:00
c8e0c16d09
Merge pull request #8520 from MrPerson/effect_cleanup
...
Effect pooling
2015-03-30 01:21:40 +11:00
7336e6ecb8
Call Centcom! ERTs got fixed!
2015-03-29 03:54:54 +01:00
55b81363cc
Merge remote-tracking branch 'upstream/master' into hardjet
...
Conflicts:
code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
17067d9021
Merge pull request #8508 from phil235/SlimeAnimal
...
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
1fc89cb611
removes soh singulo interaction
2015-03-26 13:19:56 +11:00
a86b757d93
Merge pull request #8291 from Xhuis/nerf_thermal_vision
...
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
1b3eb49a1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
e92fe6c333
Merge pull request #8495 from dannno/hahaobjectionxd
...
adds hammer and gavel
2015-03-25 16:13:39 -07:00
a6a9aa8a89
adds some sanity checks
2015-03-25 18:03:48 +11:00
a5396f320a
confirmation check for boh bombing + soh also makes singulo
2015-03-25 17:29:43 +11:00
9a217503aa
Merge pull request #8451 from Fayrik/FoamForceFuckYeah
...
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
a37ac1d600
warning span for gavel
2015-03-24 22:53:11 -04:00
b6c71dc50d
Effect pooling
...
obj/effect/effect all pool themselves.
PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist().
RCD's now delete their spark system and properly garbage collect.
2015-03-24 11:44:49 -07:00
59af7cfd42
Merge pull request #8323 from Mandurrrh/miningborgupgrade
...
Adds a cyborg upgrade module for the satchel of holding.
2015-03-24 16:40:52 +11:00
b73dd39854
Merge pull request #8436 from phil235/VendMachineCoinItemsFix
...
Fixes vending machines starting with no coin or hacked items.
2015-03-23 16:33:26 -07:00
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
365c36c1e0
repair gavel syntax
2015-03-22 20:36:10 -04:00
3254142b21
adds hammer and gavel
2015-03-22 20:22:27 -04:00
973f374276
Fixed the C4 being planted on the DA.
2015-03-22 16:26:58 +00:00
7f6871c233
Fixes conflicts and commits
2015-03-21 12:47:25 -04:00
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
5d1155e09e
Merge pull request #8435 from Zelacks/ChemImplantGuiFix
...
Chemical implant action button fix
2015-03-21 17:25:08 +11:00
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
17fe2ae3f2
Fixes vending machines starting with no coin or hacked items. Now those items also use the resupply canister charges, but they are the last ones to be resupplied.
...
Fixes the amount of charges per resupply canister so all vending machines starts fully loaded.
2015-03-20 00:28:44 +01:00
Sawu
norill
blah
Zelacks
phil235
Cheridan
Remie Richards
Jordie
Orange Borg
Artur
ACCount12
phil235
Fayrik
Cheridan
xxalpha
hornygranny
dannno
MrPerson
Xhuis
Razharas