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
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
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
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
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
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
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
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
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
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
SkyMarshal
1eb2ceb643
Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE.
2012-11-09 22:30:38 -07:00
Ater Ignis
af0593e07b
Chemistry on child reagents and in mobs
...
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
2012-11-09 20:53:20 +04:00
Chinsky
f45855078b
Admin revive now fixes beheaded peps.
2012-11-09 20:29:03 +04:00
Chinsky
73ebc5c248
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-09 20:13:09 +04:00
Chinsky
7a8899cf42
Updated admin revive to work with organs and bloodloss
2012-11-09 18:03:57 +04:00
Cael_Aislinn
6f77899396
should invert SSD to apply to normal disconnects, but not ghosting admins
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-08 22:20:34 +10:00
Kreastr
2e8b305ac3
Now gliding_size for pulled objects and mobs is also changed.
2012-11-07 13:13:45 +02:00
Kreastr
484351a200
Adapting glide size formula
2012-11-07 11:51:44 +02:00
Kreastr
cf01509f8e
Split speed from actual delay time
2012-11-07 11:23:45 +02:00
Kreastr
2a80909a94
Making it work
2012-11-07 11:16:28 +02:00
Kreastr
f82952d347
Fixes
2012-11-07 01:39:56 +02:00
Kreastr
001ea33ce0
Merge branch 'animation'
...
Merging animation fixes
Conflicts:
baystation12.dme
code/defines/obj.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_movement.dm
config/admins.txt
2012-11-07 01:38:28 +02:00
Kreastr
2deb70a1a9
Some changes. Untested.
2012-11-07 00:08:02 +02:00
Cael_Aislinn
dba38d5508
made helmets etc properly hide hair
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-03 23:46:41 +10:00
Cael_Aislinn
739e965b5f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme
...
Conflicts:
baystation12.dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-03 12:21:54 +10:00
headswe
cafd51e1a8
Merge pull request #1862 from Ravensdale/master
...
(Adjusted)Adjusts items emergency lockers spawn with, AI-less borgs spawn with NT not asmimov laws
2012-11-02 10:13:12 -07:00
headswe
8b963cad83
Merge pull request #1857 from comma/master
...
Alt titles, char records & small fixes.
2012-11-02 10:11:45 -07:00
Hawk-v3
538c57ca1c
Merge pull request #1866 from Hawk-v3/master
...
Removing Fatness
2012-11-02 09:02:08 -07:00
Hawk_v3
dff741ce20
Removing Fatness.
2012-11-02 15:29:13 +00:00
