Hawk-v3
317e40795a
Merge pull request #1939 from CIB/master
...
Misc stuff
2012-11-14 10:29:57 -08:00
cib
0491390edc
Corrected the blood warning levels in medical scanner.
2012-11-14 18:13:04 +01:00
SkyMarshal
2fece529af
Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps.
2012-11-13 22:46:43 -07:00
cib
422ec63bfc
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib
c7b8bda2af
Merge branch 'master' of github.com:CIB/Baystation12
2012-11-13 17:14:58 +01:00
cib
3dc4a56554
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-11-13 15:39:38 +01:00
CIB
74c5235c9d
Added back the "unknown substance" message
2012-11-13 14:11:03 +01:00
Chinsky
8e60315b11
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky
bd20233c35
Added color coding to health analyzers, much like crew monitors.
...
Numbers for each damage will be written in corresponding color, bolded if above 50.
2012-11-13 01:56:31 +04:00
Ispil
814a670572
Fix to issue #1887 .
2012-11-12 12:29:55 -07:00
cib
e92cecdefe
Added basic germ code.
...
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
cib
fb295ee0cf
Balancing for genetics side-effects:
...
- The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time.
- Reduced radiation created from syringes, since there are other side-effects now.
2012-11-11 18:51:02 +01:00
cib
eb49378575
Added genetic side effects.
2012-11-11 18:15:12 +01:00
cib
2522d5e7f1
Fixed up autoinjectors and added health analyzer to regular first aid.
2012-11-11 11:45:24 +01: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
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
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
4e6a77edb4
Stopped cig butts falling out of mouths.
2012-11-03 10:37:30 +04: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
2d216bf746
Fixed bug with unpickable cig butts.
...
And just generally got rid of unneeded vars.
2012-10-30 06:25:32 +04:00
Chinsky
964e28df42
Fixed runtie in cig code.
2012-10-30 01:34:53 +04:00
headswe
9fda27f6a9
Merge pull request #1820 from Spamcat/master
...
Alt satchels, adjustable masks, ashtrays.
2012-10-28 02:33: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
