6fa8e5f02d
Adds Abduction Mode
2015-04-13 18:40:15 +02:00
5f169e8e47
Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
...
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.
Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.
Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.
Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.
Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00
23f31693fa
Merge pull request #8739 from phil235/FoodRecipes2
...
A whole new bunch of foods and drinks
2015-04-09 23:28:31 -05:00
e6e0143ec5
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/MiniStation/z2.dmm
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
09067eac4f
Removed Reviver implant. Commented out some implant designs.
2015-04-07 07:52:07 +01:00
8a3e2f75a3
Better sprites for chest cyber implants.
2015-04-04 20:06:10 +01:00
7ec043a542
Added medical hud implant to CMO locker. Added chest implant sprites.
2015-04-04 00:56:06 +01: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
c1bf12345e
Added ability for Medical HUDs to detect cybernetic implants.
2015-03-30 17:52:08 +01:00
d1f6edec01
Tweaked Close surgery step healing amount.
2015-03-30 02:28:21 +01:00
74d34a8ef1
Added Reviver implant.
...
Added origin tech to Reviver implant.
Removed debug message.
2015-03-30 02:26:47 +01:00
cc7fa8ed4b
Added two more implants. "Close" surgery now heals damage.
2015-03-29 20:33:45 +01: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
eadfecd552
- Makes body_egg parent for alien embryos/changeling eggs
2015-03-24 17:54:20 +01: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
920f97608a
Fixed bugs.
2015-03-21 11:53:54 +00:00
d9921411b8
Changed anti-drop implant emp_act(). Added designs to mech fabricator.
2015-03-21 00:17:27 +00:00
69d4536844
Code tweaks. Designs are now in 'Medical'.
2015-03-20 22:57:52 +00: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
a9b18759f2
Fixed HUD examine features.
2015-03-19 19:41:05 +00:00
31de411a11
Merge remote-tracking branch 'upstream/master' into cyberimplants
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/mob_defines.dm
2015-03-18 20:11:51 +00:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
27cfbdcb2a
Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car
...
Fixes cavity implant surgery not respecting NODROP
2015-03-13 12:23:44 +01:00
821a967986
Added Research designs for all implants. Added brain implant emp_act().
2015-03-10 23:39:08 +00:00
b2baa54a08
Added anti-stun brain implant.
2015-03-10 22:28:53 +00:00
0f01378e7a
Reworked suggested code, added brain implants, misc additions.
...
Fix missing ')'.
DELETE THIS
2015-03-09 20:39:09 +00:00
dd2fe28678
Fixes cavity implant surgery not respecting NODROP
2015-03-08 16:35:46 -04:00
fc81daee07
Added Thermals and emp_act(). Tweaked some related code.
2015-03-08 20:19:02 +00:00
b1e340b19b
Added X-ray implant, implant icon, touched up surgery.
2015-03-08 17:25:05 +00:00
38bae63251
Added cybernetic implants and surgery.
2015-03-06 18:52:04 +00:00
5e9e6a0264
Embedded object removal added to revive() changeling revive and fleshmend
2015-02-27 17:57:22 +00:00
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00:00
bc2c692825
Adds a full assortment of surgery tools to the mediborg
...
Mediborgs won't accidentally slice up people if they use the wrong tool
Mediborgs won't fail surgery steps
2015-02-14 14:04:26 -05:00
154a94105d
Minor cleanup + Committing the surgery
2015-02-13 13:08:45 +00:00
34ced43f45
Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars!
2015-02-13 12:59:02 +00:00
a5c9a7292f
Makes butcher's cleaver a child of kitchen knife
2015-01-05 17:23:03 -05:00
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
f87da5939a
Making nutrition level values into defines.
...
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
2014-12-13 17:15:35 +01:00
8d110ee496
Tiny clean up, still lots of work to do
...
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
7153becc62
Fixes implants not updating the implant secHUD
...
Makes med huds /carbon because of monkeys
Makes HUDs update after implant removal surgery
Fixes cloning not recovering antag huds
2014-11-27 12:56:17 -03:00
705a264dcf
Makes data huds passive.
2014-11-16 01:52:06 -03:00
75de135f97
removing comment.
2014-09-21 22:26:18 +02:00
df554f1049
derp, last one missing
2014-09-21 22:23:57 +02:00
b12273800e
missing two parse_zone.
2014-09-21 22:22:02 +02:00
672b352f8f
Fixes "r_arm" (or equivalent) appearing in two surgery related messages.
...
Fixes Robolimb overlay being placed on a limb other than the surgery location during the last step of augment surgery.
2014-09-21 22:16:34 +02:00
8672e58e3a
Fixing typos.
2014-09-15 19:50:34 +02:00
ab949b027f
Merge pull request #4058 from AstralSerpent/master
...
Removes an unused suicide_act() on the scalpel and traitor code words will be announced at round end.
2014-07-05 17:44:27 +02:00
ddb9955e53
Removed an unused suicide_act proc belonging to the scalpel.
2014-07-02 09:27:06 +10:00
3a7c25572e
Modernized the UI of the operation computer.
2014-07-01 21:20:50 +01:00
AnturK