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
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
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
d6b249b945
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-11-07 15:48:10 +10: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
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
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
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
SkyMarshal
70c2fb231d
Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid
2012-11-04 16:17:35 -07: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
Chinsky
d42f601308
Ported photo system.
2012-11-04 09:53:38 +04:00
Hawk-v3
93ca65d2ca
Merge pull request #1858 from caelaislinn/bs12_with_tgport
...
Miscellaneous things
2012-11-03 09:04:59 -07: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
Hawk-v3
cd641c3370
Merge pull request #1861 from AterIgnis/detonators
...
Detonators
2012-11-03 04:31:16 -07:00
Chinsky
d56b400b0c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-03 12:03:46 +04:00
Cael_Aislinn
4a5a80f3bb
fixed alien whitelist (wasn't being loaded at round start), removed myself from admins
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-03 16:57:59 +10:00
Chinsky
4e6a77edb4
Stopped cig butts falling out of mouths.
2012-11-03 10:37:30 +04:00
Chinsky
946645175e
TG fix for voting window not going away.
...
Thanks elly1!
2012-11-03 08:04:47 +04: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
Chinsky
9fdbf5006a
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-02 04:49:52 +04:00
