cib
79e4bfec2c
Added merge driver for .dmm files.
2012-11-11 01:02:19 +01:00
Mloc
4fd90875bc
Merge pull request #1904 from RawrTaicho/master
...
Issue #1818 - Freeform Module Broken Again
2012-11-10 09:27:37 -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
Mloc
939e38a5b3
Merge pull request #1902 from AterIgnis/dna_update
...
updated DNA code to have more mutations
2012-11-10 08:56:30 -08:00
Connor Reynolds
2f5621fedb
Issue #1818 - Freeform Module broken again
...
-Think- I fixed it. It shouldn't just stop the user after they enter the
law priority number now. Should work properly.
2012-11-10 16:53:39 +00: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
Mloc
6bfdbdd606
Merge pull request #1898 from SniperYeti/master
...
Security Belt Modifications (Added the stuff I missed)
2012-11-10 01:15:26 -08: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
MrYeti
9f16527552
Update code/game/objects/items/weapons/storage/belt.dm
2012-11-09 19:36:12 -05:00
MrYeti
ea1d27a6a2
Update code/game/objects/items/weapons/storage/belt.dm
2012-11-09 19:26:47 -05:00
Mloc
510d1f9e49
Merge pull request #1896 from CIB/master
...
Compile fix
2012-11-09 10:02:07 -08:00
cib
7538bff7d5
Fix to broken map commit.
2012-11-09 21:58:25 +04:00
Mloc
cc99bf13e1
Merge pull request #1895 from CIB/master
...
Adds virology machinery
2012-11-09 09:48:45 -08:00
cib
ff3045080a
Added virus2 machinery to virology.
2012-11-09 21:42:19 +04:00
Hawk-v3
5c7baebbdd
Merge pull request #1880 from AterIgnis/chemistry_on_child_reagents
...
Chemistry on child reagents
2012-11-09 09:05:32 -08: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
Hawk-v3
3c6f8193af
Merge pull request #1881 from AterIgnis/gib_by_internal_explosion
...
Internal explosions
2012-11-09 08:34:06 -08:00
Ater Ignis
116b17e2be
internal explosions
...
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
2012-11-09 20:24:44 +04:00
Hawk-v3
3cfb201846
Merge pull request #1839 from AterIgnis/ed209
...
ED209 not showing on remote-control chip of security PDA
2012-11-09 07:42:09 -08:00
Hawk-v3
a114c79aca
Merge pull request #1894 from comma/master
...
Limb surgery
2012-11-09 06:52:49 -08:00
Hawk-v3
86f3622d1c
Merge pull request #1893 from SniperYeti/master
...
Security Belt Modifications
2012-11-09 06:50:25 -08:00
Hawk-v3
c4c065dfba
Merge pull request #1885 from caelaislinn/bs12_with_tgport
...
remaining map updates, plus misc
2012-11-09 06:49:39 -08:00
Chinsky
a2f4c91e4a
Made limbs prepeared for replacement stop hurt.
2012-11-09 18:07:02 +04:00
Chinsky
18f56f4a38
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-09 14:32:49 +04:00
Chinsky
2bf2d11730
Merge branch 'limbsurgery'
2012-11-09 14:32:22 +04:00
Chinsky
5043147cfc
Added prothesis instll surgery.
2012-11-09 13:22:55 +04:00
MrYeti
6a129ea312
Update code/game/objects/items/weapons/storage/belt.dm
...
Added tasers and stun baton to the security belt and now has 7 slots.
2012-11-08 22:31:32 -05:00
Mloc
285984aae6
Merge pull request #1892 from SkyMarshal/bugfixes
...
Fixed some runtimes with mulebots, the security computer, and the medica...
2012-11-08 13:52:02 -08:00
SkyMarshal
9b3389145e
Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error.
2012-11-08 14:49:01 -07:00
SkyMarshal
f711ffdc8c
Merge pull request #1891 from SkyMarshal/bugfixes
...
Someone removed me as a Game Master, and this pisses me off both since I have to readd it and since I need it to debug.
2012-11-08 13:00:42 -08:00
SkyMarshal
ebf635853b
Someone removed me as a Game Master, and this pisses me off both since I have to readd it and since I need it to debug.
2012-11-08 13:59:45 -07:00
Mloc
05ee56178f
Merge pull request #1888 from comma/master
...
Configs and logging
2012-11-08 08:50:54 -08: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
Chinsky
ef6d50b5c4
Added logging of status screen text change.
2012-11-08 15:44:34 +04:00
Chinsky
c55e290d4b
updated configs on MLoc's request.
...
Swapped loading mods and loading admins in places during worldstart, so former mods will properly adminned.
Fixed paths for custom items.
2012-11-07 20:35:02 +04:00
Chinsky
47db4eded3
Can attach limbs now. No preparations needed yet.
2012-11-07 20:01:55 +04:00
Cael_Aislinn
c42003cdf6
added and tested cycling airlocks to all remaining plcaes that needed them - 4 x solars, engineering aux, medsci aux, research outpost, mining outpost, 2 x mining station
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-07 18:52:33 +10:00
Cael_Aislinn
d6b249b945
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-11-07 15:48:10 +10:00
Mloc
2e26740bee
Merge pull request #1882 from comma/master
...
Instabeams, Crew Transfer and small tweaks
2012-11-06 10:59:19 -08:00
Chinsky
400263389a
Changelog.
2012-11-06 22:54:10 +04:00
Chinsky
a24b637de5
Readded missing sprites fro responder jacket.
2012-11-06 22:46:42 +04:00
Chinsky
9dc9198237
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-06 22:41:19 +04:00
Chinsky
a02a337fed
Added option to call crew transfer to Comms computers.
2012-11-06 22:38:02 +04:00
Chinsky
b10b035552
Changed Command Channel color to more visible one.
2012-11-06 21:23:58 +04:00
Chinsky
1a02f2ff1c
Proted instabeams for energy projectiles.
...
Also buffed laser damage to pre-merge.
2012-11-06 20:35:48 +04:00
Cael_Aislinn
0d77854520
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-11-06 23:04:47 +10:00
Chinsky
4a9c7b82ae
Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times.
2012-11-06 16:37:16 +04:00
Chinsky
5276c85664
medical belts can hold gloves and mask again.
2012-11-06 14:11:31 +04:00
Chinsky
9a4535be69
Added logging of thrower for stunbatons.
2012-11-06 13:29:01 +04:00
