Commit Graph

150 Commits

Author SHA1 Message Date
Razharas e6b738734a Merge pull request #8876 from xxalpha/fixfixfix
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
phil235 aa5541070c Merge pull request #10082 from xxalpha/bass
Fixed not being able to insert a brain into an MMI.
2015-06-21 19:33:45 +02:00
xxalpha 609d65af58 Fixed surgical step 'saw' not working properly on non humans.
better
2015-06-21 18:26:00 +01:00
phil235 e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
phil235 2e7ddc1f45 Merge pull request #9053 from MrPerson/screen_alert_2
More screen alerts
2015-06-15 01:00:20 +02:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Iamgoofball f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
MrPerson 9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2
Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi
2015-06-09 03:23:18 -07:00
Cheridan ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
Bugfix: Witticism depleted editon
2015-06-03 09:49:51 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Jordie0608 03ab08112f animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie 2015-05-31 18:25:34 +10:00
xxalpha 662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix
Conflicts:
	icons/obj/storage.dmi
2015-05-29 21:45:18 +01:00
xxalpha 1a79e0eafd Fixed using the wrong robotic limbs for augmentations. 2015-05-16 12:44:53 +01:00
xxalpha 68c1158427 Fixed being able to insert NODROP items into people with cavity implant.
Changed fix to use the right bitwise operator.
2015-05-16 01:06:51 +01:00
xxalpha f0351e1890 Tweaked uplink prices.
Undo X-ray requirement change.
2015-05-15 21:54:08 +01:00
Cheridan f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
Jordie 6008404738 Merge pull request #9185 from AnturK/aliens_stole_my_branch_name
Abduction Update 2.5
2015-05-02 23:59:48 +10:00
Jordie 840d858aa1 Merge pull request #9202 from xxalpha/igppigigppigigppigigppig
Fixed surgery closing step not removing bleeding overlay.
2015-05-02 23:59:06 +10:00
AnturK a92b3b24e4 - Adds make abductor buttons on traitor panel
- Fixes clotheless surgery
2015-05-02 12:54:52 +02:00
phil235 752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
xxalpha b9b741a6ae Fixed surgery closing step not removing bleeding overlay. 2015-04-27 20:27:53 +01:00
Remie Richards 95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
AnturK f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos 9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
xxalpha 32746ba73a Merge remote-tracking branch 'upstream/master' into fixfixfix 2015-04-22 18:03:35 +01:00
MrPerson 8f0cda1afa More screen alerts
High (uses "Hallucinating" icon), blind, embedded objects, asleep, weightlessness, new law (silicons), hacked (cyborgs), and locked down (cyborgs). The new law alert times out on its own after 30 seconds. The code for timing out is rough but works.

Sprites are provided by ZyloWalsh and can be seen at https://tgstation13.org/phpBB/viewtopic.php?f=11&t=3167
Drunk isn't in atm because I was waiting on phil to finish some reagent stuff. Hallu kind of ruined the "surprise" so I decided not to use it. Weaken/stun/paralysis are also not in right now because I'm lazy. All the sprites are included even if they're unused.

Added a proc human/has_embedded_objects() that returns 1 if src has any objects embedded in any limbs.
2015-04-18 16:54:36 -07:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
xxalpha 91cdab2b9c Added implants to Nuke uplink. Removed random implant spawner. 2015-04-12 03:18:44 +01:00
phil235 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
xxalpha 3c3c87aeae Merge remote-tracking branch 'upstream/master' into fixfixfix
Conflicts:
	_maps/map_files/generic/z2.dmm
2015-04-10 17:17:35 +01:00
xxalpha e11a913f23 Fixed Nutriment printing bug. Added new Reviver implant. 2015-04-10 16:30:39 +01:00
Cheridan 23f31693fa Merge pull request #8739 from phil235/FoodRecipes2
A whole new bunch of foods and drinks
2015-04-09 23:28:31 -05:00
phil235 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
xxalpha 09067eac4f Removed Reviver implant. Commented out some implant designs. 2015-04-07 07:52:07 +01:00
xxalpha 8a3e2f75a3 Better sprites for chest cyber implants. 2015-04-04 20:06:10 +01:00
xxalpha 7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
phil235 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
xxalpha c1bf12345e Added ability for Medical HUDs to detect cybernetic implants. 2015-03-30 17:52:08 +01:00
xxalpha d1f6edec01 Tweaked Close surgery step healing amount. 2015-03-30 02:28:21 +01:00
xxalpha 74d34a8ef1 Added Reviver implant.
Added origin tech to Reviver implant.

Removed debug message.
2015-03-30 02:26:47 +01:00
xxalpha cc7fa8ed4b Added two more implants. "Close" surgery now heals damage. 2015-03-29 20:33:45 +01:00
phil235 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
AnturK eadfecd552 - Makes body_egg parent for alien embryos/changeling eggs 2015-03-24 17:54:20 +01:00
phil235 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
xxalpha 920f97608a Fixed bugs. 2015-03-21 11:53:54 +00:00
xxalpha d9921411b8 Changed anti-drop implant emp_act(). Added designs to mech fabricator. 2015-03-21 00:17:27 +00:00
xxalpha 69d4536844 Code tweaks. Designs are now in 'Medical'. 2015-03-20 22:57:52 +00:00