Commit Graph

8983 Commits

Author SHA1 Message Date
Incoming dd2fe28678 Fixes cavity implant surgery not respecting NODROP 2015-03-08 16:35:46 -04:00
xxalpha fc81daee07 Added Thermals and emp_act(). Tweaked some related code. 2015-03-08 20:19:02 +00:00
Iamgoofball f602408aef Update Chemistry-Goon-Medicine.dm 2015-03-08 13:12:29 -07:00
Ahammer18 0aa2246231 Fixed changelog and color 2015-03-08 13:52:26 -05:00
Iamgoofball 61e1abafc6 Meth no longer breaks the space time continuum. 2015-03-08 10:45:25 -07:00
Iamgoofball 8b14886c51 Cyborgs no longer have flesh to knit. 2015-03-08 10:44:43 -07:00
xxalpha b1e340b19b Added X-ray implant, implant icon, touched up surgery. 2015-03-08 17:25:05 +00:00
norill 3796f32394 fixed improper req_tech "power" -> "powerstorage" in several research designs 2015-03-08 18:23:34 +01:00
phil235 93c982ea5c Fixes hulks not losing their mutation when low on health.
Fixes carbon mobs resistant to paralysis not going unconscious when in crit.
2015-03-08 16:38:44 +01:00
phil235 282d0231e0 WIP moving carbon/life to living/life() 2015-03-08 16:22:41 +01:00
phil235 b669f363d3 Fixes mimana not dropping mimanapeel when eaten.
Fixes typo in oat stalks
Fixes Reagent metabolization only calling the reagents on_mob_life procs once every two life().
Moving dizziness, drowsiness and jitteriness natural decreases all inside carbon/handle_regular_status_updates()
Drowzyness now drops faster when resting.
Slight adjustment to mutetoxin effect on mob.
2015-03-08 13:53:23 +01:00
Cheridan 79d05ad5c6 Merge pull request #8188 from phil235/VineGripFix
Fixes vines not releasing mobs from their grip when destroyed.
2015-03-08 01:08:16 -06:00
Ahammer18 cd1472bc42 Updated 2015-03-07 22:34:56 -06:00
Ahammer18 d295a401a1 A bit of a test I did, added slimecake. 2015-03-07 22:23:01 -06:00
Xhuis 9eddc94ccd fixes args 2015-03-07 21:23:01 -05:00
Xhuis 71e2f745d4 Update paper.dm 2015-03-07 21:22:08 -05:00
Xhuis 7ac05bc3fd Fixes ogresight + removes burntime var 2015-03-07 21:13:18 -05:00
Xhuis b2d5c9c3c2 Allows paper burning 2015-03-07 20:59:14 -05:00
Iamgoofball 768a6f7305 Update Blob-Reagents.dm 2015-03-07 15:35:53 -08:00
phil235 1d9106e6f0 Changing Coffee jittering to be an overdose effect. 2015-03-07 23:42:44 +01:00
Iamgoofball 42c3d0164e Black powder hotfix
seriously merge this ASAP, fuck your 24 hour limit this needs fixed
2015-03-07 13:29:07 -08:00
phil235 00fdd0eded Monkeys and xeno can flush disposal units. 2015-03-07 22:22:06 +01:00
phil235 fdc0399a46 Ventcrawlers can now climb into disposal by themselves. 2015-03-07 20:03:25 +01:00
Remie Richards 643de0c922 Hostile mobs no longer run all their hostile targeting/hunting code if there is nobody (or item, for those that hunt items) near them, they simply move to a simpler loop that decides whether to let the main loop continue. 2015-03-07 18:46:02 +00:00
phil235 77d553e619 Fixes disposal climbing.
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
Remie Richards 04dcfaddcf Merge pull request #8135 from Miauw62/adminjumpfixes
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
Miauw f84f6aafcd Fixes adminjump being dumb. 2015-03-07 19:00:48 +01:00
Iamgoofball 50f5951115 Nerfs acid blob again
goddamn acid blob
2015-03-07 09:51:01 -08:00
Cheridan 95e269e211 Merge pull request #8122 from Xhuis/miners_messiah
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
Incoming5643 febd47c6d6 byond inline spell checker fucking when 2015-03-06 15:20:56 -05:00
hornygranny 68c791ee7c Merge pull request #7751 from RemieRichards/ProceduralGeneration
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
hornygranny d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
xxalpha 13e291a4e9 Merge remote-tracking branch 'upstream/master' into catwalkmachines
Conflicts:
	code/game/turfs/turf.dm
	code/modules/power/power.dm
2015-03-06 19:19:09 +00:00
xxalpha f0c3c9af07 Merge remote-tracking branch 'upstream/master' into cyberimplants 2015-03-06 18:52:25 +00:00
xxalpha 38bae63251 Added cybernetic implants and surgery. 2015-03-06 18:52:04 +00:00
phil235 346007201b Fixes vines not releasing mobs from their grip when destroyed. 2015-03-06 19:35:50 +01:00
Cheridan d5ec11b91c Merge pull request #8080 from Incoming5643/Appearance_fix
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06:00
phil235 d4de07d336 Fixes ghostburger and appendixburger icons. 2015-03-06 12:38:08 +01:00
Cheridan 6b512f663a Merge pull request #8137 from Incoming5643/so_misunderstood
Removes the Spooky
2015-03-06 00:09:25 -06:00
Cheridan 9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
Cheridan 8fa6b3edea Merge pull request #8140 from phil235/doughbeakerfix
Improvised heating fixes
2015-03-05 22:58:44 -06:00
MrStonedOne b0b4d7f580 IsBanned() now rejects blank ckeys/ips/cids
Also removes the admin notice. Its still logged, but this way the admins don't get spammed during world reboot.
2015-03-05 19:35:33 -08:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Cheridan 50b8e2267e Merge pull request #8146 from phil235/HydroTrayLightsSpritesFix
Fixes HydroTray Lights sprites.
2015-03-05 20:28:33 -06:00
AnturK 27c0ea067f Fixes pref flags 2015-03-05 21:35:33 +01:00
Incoming 546c5eedc4 if you have AI or cyborg set to high, you'll see that in the preview window instead of a nondescript naked human 2015-03-05 14:23:19 -05:00
Swag McYolosteinen a341fd72b0 Merge pull request #8065 from paprka/squiddeath
Rebalances thermals
2015-03-05 19:14:57 +01:00
Swag McYolosteinen 372e082c66 Merge pull request #8013 from paprka/altclick
Alt-click for aesthetic toggling
2015-03-05 19:12:07 +01:00
Swag McYolosteinen 93a5ba6e16 Merge pull request #8132 from MrStonedOne/wellthen
Fixes irc alerts of adminhelps not showing the ckey
2015-03-05 19:02:15 +01:00
Miauw 82bc75c263 Moves chat toggles into their own variable. 2015-03-05 18:38:07 +01:00