Commit Graph

421 Commits

Author SHA1 Message Date
coiax a8fa7f213d Slime grinders only suck when not grinding
🆑 coiax
tweak: Slime grinders now cease suction of new slimes while grinding
/🆑

Fixes -tg-station/code/modules/food&drinks/kitchen machinery/processor.dm
2016-04-17 23:40:02 +01:00
Cheridan d682fccd14 Merge pull request #16901 from nullbear/monkey-cube-fix
Fixes monkey cube Dupe Glitch
2016-04-17 09:21:48 -05:00
coiax 5925427464 Slime grinders now suck up more than one slime (#16908) 2016-04-17 06:14:22 -06:00
nullbear 1cb85c3024 Fixes monkey cube Dupe Glitch
fixes https://github.com/tgstation/-tg-station/issues/14667

Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.

Prevents grabs from being placed in disposals, as they were being
before.
2016-04-15 21:36:34 -07:00
Cheridan 2f52e7daf9 Merge pull request #16829 from erwgd/LetUsMakeDinnerware
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
erwgd 9d6247c890 Removed bowl making code from biogenerator.dm
Added bowl design to autolathe_designs.dm
Changed bowl materials to 500 glass
2016-04-14 17:14:01 +01:00
Jack Edge 52827cc7b9 Merge branch 'master' into without-the-crates 2016-04-14 08:50:14 +01:00
Cheridan 5a51d2e9f9 Merge pull request #16818 from phil235/FixSeedShit
Fixes Seed runtimes
2016-04-13 15:58:59 -05:00
erwgd ca88d3f025 added shot glass and shaker designs to autolathe
defined materials for shot glass and shaker
2016-04-13 17:17:15 +01:00
erwgd f0a6af827e Added bowl design to biogenerator.dm
Added recipes for fork and drinking glass to autolathe_designs.dm
Defined materials for fork, bowl, drinking glass
2016-04-12 19:39:09 +01:00
phil235 d03a5c9343 Simplifies the build_recipe_text() proc used by tablecrafting to not create and delete an object just to get its name (replaced by the "initial()" trick).
Adds some if(seed) checks to growns code to prevent runtimes for seedless growns.
2016-04-12 03:51:45 +02:00
AndrewJacksonThe2nd a075043f86 Arnold Palmer, Auto-collecting Slime Processors, and Cyborg Booping 2016-04-09 15:34:10 -07:00
TrustyGun 022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
TrustyGun 927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
TechnoAlchemist c8bb360fe3 Goliath meat has its own sprite, goliath steaks don't magically generate plates. 2016-04-06 21:15:48 -07:00
duncathan 497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
KorPhaeron c93abbb0b9 Adds Techno's absinthe to mining
* Absinthe

* Formatting
2016-04-02 23:48:24 -04:00
KorPhaeron 03216dce2e Merge pull request #16465 from TehZombehz/foodbox
Adds random ingredient food packages to chefs
2016-03-31 04:03:09 -05:00
duncathan salt 1ff5882696 Merge pull request #16473 from KorPhaeron/goliath_meat
Goliath changes
2016-03-31 00:35:13 -06:00
TehZombehz 0f26065c64 HOPEFULLY removes conflicts
First attempt ev
2016-03-30 17:12:55 -05:00
TehZombehz fa98ae963e Updates nutritional content with honey
Since honey supposedly also acts as a mild healing chemical, replacing
vitamin with honey seems optimal.
2016-03-30 03:07:27 -05:00
KorPhaeron 64a83e6871 Goliath Meat 2016-03-29 03:39:00 -05:00
TehZombehz e13840ffde Adds random ingredient food packages to chefs
Adds various ingredient boxes, a random one of which is chosen for the
chef to start with. Also adds soysauce bottles preset items.
2016-03-28 22:58:03 -05:00
TehZombehz 58b964c6da Adds some honey foods and changes mead
Adds honey buns, honey buns, and changes mead recipe to require honey.
2016-03-28 18:57:01 -05:00
phil235 7c2203857c Merge pull request #16147 from Xhuis/bacchus_approves
Alcohol Refactor (Merge-Ready)
2016-03-24 19:05:56 +01:00
Cheridan 454af7cb2d Merge pull request #16197 from KorPhaeron/crates
Adds abandoned crates to lavaland (sort of)
2016-03-19 21:29:18 -05:00
Xhuis 703f790d9f Removes uranium from Fetching Fizz recipe 2016-03-19 16:14:56 -04:00
Xhuis c461128a56 Alcohol refactor 2016-03-19 16:09:43 -04:00
KorPhaeron ab263f6d90 Abandoned Crates 2016-03-18 20:54:20 -05:00
F-OS 368a64edb7 annnnd i'm a moron 2016-03-17 10:43:11 -07:00
F-OS 017649f40e Fixes issue #14826 2016-03-17 10:41:59 -07:00
TehZombehz 5e22c77ab1 Change requested by Kor <3 2016-03-16 17:52:59 -05:00
TehZombehz 5e1c2cbee7 Fix Kor pointed out (I think) 2016-03-15 13:39:08 -05:00
TehZombehz 6b0c8d8fe8 'Chicken' nuggets added 2016-03-15 05:55:50 -05:00
Incoming c30f01f452 Some type reshuffling to save a few lines 2016-03-13 17:40:38 -04:00
Incoming 8cbc83926a no such thing as MAT_IRON 2016-03-12 15:52:19 -05:00
Incoming 32acc62378 Adds silver, bronze, and pewter trophies so you can properly quantify a player's level of success.
Removes the subtyped trophy that has no reason to exist in a post 2011 world.
2016-03-12 15:44:22 -05:00
Cheridan e43b3a891d Merge pull request #15964 from RemieRichards/buckle_many_mobs
Many Buckled Mobs
2016-03-10 08:22:27 -06:00
Remie Richards 4e821d8657 Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality 2016-03-07 18:03:25 +00:00
c0 08bdcc3024 Plant Refactor 4 2016-03-07 12:46:12 +03:00
c0 a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
c0 0e1ae09e92 Plant Refactor: Revenge of the Grown 2016-03-02 07:30:06 +03:00
c0 23f1123b9a Name burgers are back! 2016-02-26 15:31:54 +03:00
Firecage c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00
tkdrg 1a7cbda99f Merge pull request #15253 from bgobandit/cravenoaf
Adds shots of wine, blood and liquid gibs.
2016-02-07 23:02:46 -03:00
bgobandit cca610f1e4 Adds shots of wine and other things. 2016-02-06 20:54:09 -05:00
phil235 8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
phil235 81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard 3f5f833013 Fix pizzabomb icon bug 2016-01-23 18:56:35 -06:00