Commit Graph

4253 Commits

Author SHA1 Message Date
Mloc 9ca5caa419 Fixed the fix of the movement fix thing. Or something.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-11-14 21:39:49 +00:00
Mloc 7cd054e09a Merge pull request #1941 from CIB/master
Ported autopsy
2012-11-14 13:29:20 -08:00
cib 19d2e9d390 Made the autopsy report for projectiles a bit clearer. 2012-11-14 21:33:09 +01:00
cib 2b5d3cac39 Fixed a few organ getter bugs. 2012-11-14 20:59:38 +01:00
cib 7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
Hawk-v3 317e40795a Merge pull request #1939 from CIB/master
Misc stuff
2012-11-14 10:29:57 -08:00
Hawk-v3 31a40885b5 Merge pull request #1938 from SkyMarshal/bugfixes
Fixed a compile warning, Possible fix for adminhelp-IRC relay, readded unbolting AI and associated traitor checks, reverted my grenade changes.
2012-11-14 10:29:21 -08:00
cib 09cbf1f684 Fixed a compile error. 2012-11-14 16:45:22 +01:00
cib 450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +01:00
cib e5b62c98c6 Restructured alien removal surgery.
This way it later can be used for lung surgery.
2012-11-14 13:54:18 +01:00
cib b4d335e077 Merge github.com:Baystation12/Baystation12 2012-11-14 13:33:01 +01:00
CIB 274d422cd4 Nerfed suffocation speed. 2012-11-14 11:26:56 +01:00
SkyMarshal 2fece529af Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps. 2012-11-13 22:46:43 -07:00
SkyMarshal 508f94a072 Possible fix for why IRC is not getting adminhelps. 2012-11-13 22:14:10 -07:00
MrYeti 2b56956d67 Added Smash Recipe Custom Item 2012-11-13 19:56:52 -05:00
cib 422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib 78ed2e54eb Added alien surgery. 2012-11-13 18:22:48 +01:00
cib 3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
Chinsky e5706a55d3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-13 10:12:45 +04:00
Ispil 8814647be5 Fix to AIs and Cyborgs being able to "fall asleep" when they log off, but not being able to wake up when they return. They should no longer fall asleep. 2012-11-12 21:15:26 -07:00
Ispil 0a4d79e54f Fix to Tajaran/Skrell/Soghun not mrowling/warbling/hissing, respectively. 2012-11-12 20:39:42 -07:00
Chinsky 8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky 94b54d1cef Fix for laughing gas leaks in surgery.
Humans breath out same gas mix datum they breathed in.
Works fine because in processing oxygen and CO2 levels in mix are adjusted.
But trace gases remained untouched.
So sedated patient just breathed out N20 at surgeon.
2012-11-13 03:42:40 +04:00
Chinsky 0caf4673ce Fix for sleep runtime.
Fix for internals setting message.
2012-11-13 02:05:13 +04:00
Mloc daac550822 Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-11-12 21:54:16 +00:00
Chinsky 058aa7a795 Fix for training gun runtime. 2012-11-13 01:42:11 +04:00
Mloc d659b567a4 Fix for practice lasers.
Addresses #1924
2012-11-12 20:21:30 +00:00
cib 95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib e92cecdefe Added basic germ code.
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
Ater Ignis c293803f71 artifacts full list of effects enabled, contact based effect works on toucher, not artifact itself 2012-11-12 11:11:35 +04:00
MrYeti 78d7f9ee42 Added Graduation Lighter. Deleted my own custom item. 2012-11-11 18:00:12 -05:00
Mloc ba3a9d37b2 Merge pull request #1916 from Kreastr/master
Setting proper gliding_size for mobs and objects.
2012-11-11 14:01:46 -08:00
SkyMarshal f064da7f50 Some fixes to Detective Work. 2012-11-11 14:46:37 -07:00
SkyMarshal ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
cib a14ea29df3 Replaced monkey with confusion effect.
Feature is new and don't want surprise monkeys.
2012-11-11 19:35:01 +01:00
cib a79ca39838 Forgot a spawn in trigger_side_effects 2012-11-11 19:09:36 +01:00
cib fb295ee0cf Balancing for genetics side-effects:
- The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time.
- Reduced radiation created from syringes, since there are other side-effects now.
2012-11-11 18:51:02 +01:00
cib d62aa1425f Fixed a few more bugs with genetic side effects. 2012-11-11 18:41:40 +01:00
cib eb49378575 Added genetic side effects. 2012-11-11 18:15:12 +01:00
Kreastr 9ddc1d02d9 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/mob_defines.dm
2012-11-11 16:43:28 +02:00
Kreastr 0fe02fcd27 More clean up 2012-11-11 14:39:22 +02:00
cib 2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
SkyMarshal bb3f533fb1 Merge pull request #1912 from Ravensdale/master
AI custom sprites: Re-introducing three and adding in my own.
2012-11-10 21:54:42 -08:00
Ravensdale 8cc22cbb15 Adjusts AI code to bring back custom cores and makes it easier to add in more. 2012-11-10 21:42:30 -08:00
RawrTaicho f97f887458 Annnnnnnd another custom item: http://baystation12.net/forums/viewtopic.php?f=33&t=5413 2012-11-11 00:13:43 +00:00
RawrTaicho 864dbe8a84 http://baystation12.net/forums/viewtopic.php?f=33&t=5837 2012-11-10 23:43:24 +00:00
RawrTaicho fde3147c5c - http://baystation12.net/forums/viewtopic.php?f=33&t=5801 2012-11-10 22:57:09 +00:00
Mloc 35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better
all-intents-intent-button
2012-11-10 08:58:39 -08:00
Ater Ignis 20bdba6c67 all-intents-intent-button
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
2012-11-10 14:19:02 +04:00
Ater Ignis 8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04:00