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
SkyMarshal
f66572b6a7
Merge pull request #1879 from comma/master
...
Photos and flying batons
2012-11-06 00:26:00 -08:00
Mloc
d38909eb11
Merge pull request #1877 from CIB/master
...
Virology fix
2012-11-05 12:22:07 -08:00
cib
392bdd022f
Removed the ability to create vira.
...
This ability should return when virus2 is ported fully and the machinery is added to the map.
This also fixes a possible exploit where you can supply a fake href and spawn a singularity instead of a virus(luckily it won't be added to the map though, but you can still trigger any New() proc you want)
2012-11-05 19:49:30 +01:00
Cael_Aislinn
19d52c2f1f
Merge branch 'master' of github.com:caelaislinn/Baystation12 into bs12_with_tgport
2012-11-05 22:25:26 +10:00
Cael_Aislinn
b72b378f1e
cigars and pipes can be lit by means other than matches
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-05 22:24:45 +10:00
Chinsky
5d62b98c18
Added 50% chance of thrown baton to stun mob
2012-11-05 14:46:00 +04:00
Hawk-v3
4a5c446191
Merge pull request #1875 from SkyMarshal/bugfixes
...
Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid (now guarantees melted helmet, no other changes.)
2012-11-05 01:32:47 -08:00
SkyMarshal
fb0bb4c61b
Merge pull request #1876 from Asanadas/master
...
Gamemode: Removing Anti-Revolution from game mode selection.
2012-11-04 18:39:38 -08:00
Asanadas
c49538aa8b
I am ashamed
2012-11-04 21:35:49 -05:00
Asanadas
49adb9e5cb
Anti-Rev removal compile fix.
2012-11-04 21:15:01 -05:00
Asanadas
ba6be36b12
baystation12.dme change that might work.
2012-11-04 21:07:14 -05:00
SkyMarshal
70c2fb231d
Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid
2012-11-04 16:17:35 -07:00
Hawk-v3
3b092f9d45
Merge pull request #1874 from Asanadas/master
...
Config: Adding Foolamancer to moderators.txt since he got approved.
2012-11-04 12:40:45 -08:00
Asanadas
4f8a96a120
Adding Foolamancer to the moderators.txt as per http://baystation12.net/forums/viewtopic.php?f=34&t=5637#p110395
2012-11-04 15:33:05 -05:00
Chinsky
6256200c1a
Added ability to clip photos to clipboards.
...
Added ability to view photos from clipboards and folders.
2012-11-04 21:03:17 +04:00
Chinsky
22545ebb9c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-04 19:20:22 +04:00
headswe
1ab78f1ef9
Merge pull request #1873 from caelaislinn/bs12_with_tgport
...
retrack detective files
2012-11-04 07:19:25 -08:00
Cael_Aislinn
9955852ab9
retrack detective files
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-05 01:16:21 +10:00
Cael_Aislinn
12d4aed285
added anomaly /area icon_state, fixed anomaly research outpost and shuttle, added cycling airlocks to engineering singularity access (slight reshuffle of engineering areas)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-04 16:42:32 +10:00
Chinsky
45a6cd0d00
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-04 10:03:45 +04:00
