Chinsky
91b61f91e7
Readded pain and shock system.
...
Tramadol and oxycodone are back too.
2012-10-22 06:38:57 +04:00
Chinsky
52f9c0c9dc
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-21 05:52:18 +04:00
Chinsky
085f5f7fe1
Added ability to rig fueltanks
...
To make your very own ghetto explosive:
1.Wrench faucet open on tank.
2.Add assembly of your choice (only timers and radios work as triggers here)
To unmake it simply remove assembly with hands and wrench faucet back.
Rigging tank with igniter logs for admins.
Also explosion size depends on amount of fuel left in tank.
2012-10-20 22:31:13 +04:00
Chinsky
21a19d46cb
Fixed typo, now slur should properly fade away.
2012-10-20 22:05:57 +04:00
cib
4046b80829
Corrupt heads should now be displayed in antagonist panel.
2012-10-19 10:59:01 -07:00
Chinsky
f6bcb421d4
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-18 21:35:13 +04:00
Chinsky
5f7c9d5518
Readded welder fuel.
...
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
2012-10-18 21:25:24 +04:00
Mloc
af8ab15ebf
Merge pull request #1795 from CIB/master
...
Various fixes
2012-10-18 10:18:03 -07:00
cib
ed6994d17c
Removed the silly adminhelp delay.
2012-10-18 16:33:14 +02:00
cib
01ba3871ca
Fixed the bug where 'Show Own Skills' wouldn't work.
2012-10-18 15:33:46 +02:00
Chinsky
274ac1d59c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-18 15:42:11 +04:00
Chinsky
16e6f178a4
Buffed fuel tank explosions.
2012-10-18 15:40:55 +04:00
cib
d90944ad50
Several medical related changes.
...
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
2012-10-18 12:39:04 +02:00
Chinsky
c8b7227329
Mixup in forensics jacket path
2012-10-18 10:09:14 +04:00
Chinsky
92276c9887
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/new_player/new_player.dm
html/changelog.html
2012-10-18 09:13:24 +04:00
Asanadas
0ba466e881
Removing Soghun stutters, fix for infinite BoH in BoH.
2012-10-17 19:18:17 -04:00
headswe
fde9562bb5
Merge pull request #1789 from CIB/master
...
Limb selection
2012-10-17 11:28:48 -07:00
cib
a1aa3ddecf
Ported limb selection.
2012-10-17 20:08:34 +02:00
headswe
58a63cd61f
Merge pull request #1788 from headswe/master
...
Whoops forgot a thing also reenabled a warning message but with a add…
2012-10-17 10:02:31 -07:00
Head
59964d4025
Whoops forgot a thing also reenabled a warning message but with a added check
2012-10-17 19:00:20 +02:00
cib
463178213c
You can now pick opposite gender hairstyles.
2012-10-17 18:53:00 +02:00
Mloc
a5366e8647
Merge pull request #1787 from headswe/master
...
Fixed iv drips hopefully
2012-10-17 09:31:41 -07:00
Head
ea714643b6
Hopefull fixed iv drip bug.
2012-10-17 18:27:44 +02:00
Mloc
351a233f5f
Arrivals runtime fix, thanks to Head!
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-10-17 16:07:19 +01:00
Chinsky
44934ef622
Removed my highly informative and professional debug print.
2012-10-17 14:33:53 +04:00
Chinsky
45e40c09c0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-17 14:12:41 +04:00
Chinsky
357f42028e
Forgot one hairstyle.
2012-10-17 13:50:47 +04:00
Chinsky
f0c4e3e965
Ported some of hairstyles.
2012-10-17 04:50:49 +04:00
Chinsky
da147b083c
Added Forensics Technician jackets to Detective wardrobe.
2012-10-17 03:28:59 +04:00
Chinsky
0c97d77d77
Fixes issue with slurring never going away.
...
Ethylredoxrazine now properly fights alcohol effects.
2012-10-17 03:28:10 +04:00
Chinsky
fbc26fde61
Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though.
2012-10-17 03:24:39 +04:00
Chinsky
81960d42c9
Igniter assembly now sparks when it sparks.
...
Added visual effect when it's triggered.
2012-10-16 21:14:51 +04:00
cib
7fccadfc89
Ported AutoTraitor.
2012-10-16 18:44:53 +02:00
DarkTechnomancer
981481ca56
Fixed nutrition-related messages showing up twice in the examine verb and ported pulling damage back in.
2012-10-16 00:10:40 -04:00
headswe
f296f9c3c8
Merge pull request #1761 from caelaislinn/bs12_with_tgport
...
misc merge things
2012-10-15 10:59:58 -07:00
headswe
3e94d7a682
Merge pull request #1768 from CIB/master
...
Bleeding fixes
2012-10-15 10:59:27 -07:00
cib
8f2055080d
Increased blood pack volume and IV injection rate.
2012-10-15 19:48:20 +02:00
cib
150d7e51b5
Added some medical stuff to the map.
...
Also added blood packs.
2012-10-15 19:17:38 +02:00
Chinsky
468752ea6d
Ported BS12 slur.
...
Sorta. Can't use html in said strings, so it will look a bit different.
2012-10-15 20:14:34 +04:00
Chinsky
514989394f
Cleaned up food and drinks code.
...
God bless OOP.
2012-10-15 20:13:35 +04:00
cib
a577c0bfac
Fixed a few bugs with IV drips.
2012-10-15 18:01:31 +02:00
cib
19846abebe
Halved bleeding speed.
2012-10-15 15:13:49 +02:00
Cael_Aislinn
d38cf3da27
re-enabled alien player's hair and facial hair
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-15 21:43:40 +10:00
Cael_Aislinn
e00a696a40
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-10-15 20:57:54 +10:00
Chinsky
988928b086
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-15 01:52:02 +04:00
Asanadas
840ed30875
Fixed a spelling error in the Jensen HoS coat. Sponsored by tasty Trenchoats.
...
Signed-off-by: Asanadas <asanadas@hotmail.com >
2012-10-14 15:04:00 -04:00
Chinsky
8427947bd7
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/datums/organs/organ_external.dm
code/modules/mob/living/carbon/human/human.dm
2012-10-14 20:39:26 +04:00
Cael_Aislinn
d5a4a268d7
moved mod panel to a new file, removed the admin stuff from it
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-14 14:31:45 +10:00
Cael_Aislinn
4e08f61642
made the alien player limit a config option
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-14 13:59:50 +10:00
headswe
10f32d1351
Merge pull request #1760 from DarkTechnomancer/master
...
Fixed flavor text
2012-10-13 20:10:18 -07:00