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
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
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
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
Chinsky
ef6d50b5c4
Added logging of status screen text change.
2012-11-08 15:44:34 +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
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
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
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
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
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
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
Chinsky
4e6a77edb4
Stopped cig butts falling out of mouths.
2012-11-03 10:37:30 +04: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
Ravensdale
19bca3e2ef
Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm
2012-11-01 15:43:09 -07:00
Ater Ignis
cbc31b9090
Adjustable timer for default grenades
2012-11-01 21:05:02 +04:00
Ater Ignis
e79df68ef3
added new assembled timer-igniter assembly and added that to default chem-grenades
2012-11-01 17:49:21 +04:00
Chinsky
f9a42f4ba9
...debug print.
2012-11-01 00:31:36 +04:00
Chinsky
d2bf021e7d
Cleaned up walllocker code.
...
Emergency lockers are ready to be used.
2012-10-31 02:00:39 +04:00
Chinsky
7e1e1872b2
Readded robolimbs and amputated limbs drawing properly.
...
Now character gets proper robo and amputated limbs on spawn.
Readded checks for amputated hands.
2012-10-30 07:59:54 +04:00
Chinsky
2d216bf746
Fixed bug with unpickable cig butts.
...
And just generally got rid of unneeded vars.
2012-10-30 06:25:32 +04:00
Ravensdale
ce7e72c367
Fixes what emergency lockers spawn with so masks aren't rarer than diamonds.
2012-10-29 17:11:54 -07:00
Chinsky
964e28df42
Fixed runtie in cig code.
2012-10-30 01:34:53 +04:00
Chinsky
5281cbf2e2
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-29 04:28:32 +04:00
Chinsky
27eaaa01d1
Ported virus2 system and machinery.
...
Viruses2 do not spawn anywhere yet, until machinery is on map.
2012-10-29 04:27:58 +04:00
headswe
9fda27f6a9
Merge pull request #1820 from Spamcat/master
...
Alt satchels, adjustable masks, ashtrays.
2012-10-28 02:33:19 -07:00
headswe
5c9ab3c6d3
Merge pull request #1836 from AterIgnis/detonators
...
Detonators assembly
2012-10-28 02:32:19 -07:00
Ater Ignis
72f3c70da9
primed grenades must not be disassembable easy
2012-10-28 11:20:42 +04:00
Ater Ignis
2acba34e11
fix of names in grenade
2012-10-27 19:48:48 +04:00
Spamcat
665c840da3
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-26 23:57:05 +04:00
Ater Ignis
d17f1adfab
ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected
2012-10-26 15:51:36 +04:00
Ater Ignis
156320eb3c
people suffocating in lockers and bodybags maybe cool, but suffocating in healing sleeper or dna modifier - bad, let's revert that back?
2012-10-26 13:17:04 +04:00
Ater Ignis
6337048aad
updated grenades, now with remote control, proximity control and timer control for your choosing
2012-10-25 19:56:32 +04:00
Chinsky
236780d8c6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-25 03:42:20 +04:00
