Commit Graph

7715 Commits

Author SHA1 Message Date
Ravensdale
ce7e72c367 Fixes what emergency lockers spawn with so masks aren't rarer than diamonds. 2012-10-29 17:11:54 -07:00
Chinsky
683e4f304a Fix for detective revolver.
Turns out my previous fix did not help. Problem was in detective ammo having wrong caliber.
2012-10-30 03:07:51 +04:00
Chinsky
6f1852449d Ported custom items system. 2012-10-30 02:27:51 +04:00
Chinsky
964e28df42 Fixed runtie in cig code. 2012-10-30 01:34:53 +04:00
Mloc
6d350c6529 Merge pull request #1850 from comma/master
Virus2 and small fixes.
2012-10-29 12:29:48 -07:00
headswe
36953f7eab Merge pull request #1837 from AterIgnis/dismemberment
Dismemberments
2012-10-29 04:11:28 -07:00
Ater Ignis
fa1d74e435 added comments 2012-10-29 15:04:30 +04:00
Ater Ignis
6666e0cc3e fixed i=5 crutch
I accept, that was really silly
2012-10-29 14:35:50 +04:00
Chinsky
513e4463c5 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/clothing/spacesuits/rig.dm
2012-10-29 07:23:19 +04:00
Chinsky
165ec69cfa Return of the moderator. 2012-10-29 07:12:02 +04:00
Hawk_v3
23801464cf Merge remote-tracking branch 'upstream/master'
Conflict resolved:
	code/modules/clothing/spacesuits/rig.dm
2012-10-29 01:29:47 +00:00
Chinsky
95d5912c2d Readds missing wizard rigsuit. 2012-10-29 04:54:57 +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
Hawk_v3
9185b5189c RIGs have heat resist.
Firesuits have cold resist.

You're welcome. ^v^
2012-10-28 23:39:50 +00:00
Ater Ignis
f4f3beeacb that must be a bit more correct, i think 2012-10-28 21:52:09 +04:00
Cael_Aislinn
10034cdac4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-29 02:19:28 +10:00
Hawk-v3
299c8d6433 Merge pull request #1848 from Hawk-v3/master
Cryo edit. No More Alien Race Damage.
2012-10-28 03:31:39 -07:00
Hawk_v3
b64a1cfe69 Fixed a unused area in Cryo.
Removed damaging effects to alien players. C'mon, we whitelist them already!
2012-10-28 10:28:12 +00: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
Hawk_v3
fe6ed49062 Atmospheric Pressure Suits 2012-10-28 07:11:51 +00:00
Hawk_v3
8e877047d9 Reverted Suit Cramping
Hawk_v3
2012-10-28 07:01:02 +00:00
Hawk-v3
59021935a0 Merge pull request #1843 from CIB/master
Removed duplicate folder and fix to cryo
2012-10-27 23:44:24 -07:00
Cael_Aislinn
12a677cf0b increased cramp interval, removed damage chance
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-28 15:43:55 +10:00
Ater Ignis
547635a0c4 raise default range value of proximity sensor from 1 to 2 2012-10-28 08:37:03 +04:00
Cael_Aislinn
b88aaea336 halved species-unfitting damage, made cramp damage actually stick to max 10 + lowered accum rate
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-28 10:30:39 +10:00
headswe
dcfdd23ef0 Merge pull request #1838 from AterIgnis/antisuffocate
Anti-suffocate
2012-10-27 10:03:41 -07:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Ater Ignis
61e16ee87f updated code to more readable 2012-10-27 19:29:48 +04:00
Cael_Aislinn
5b5153ee37 some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 23:39:17 +10:00
Cael_Aislinn
d38670f75a heavy suits cause cramps over time (minor brute damage at intervals of a few minutes), also made species clothing incompatabilities actually affect the relevant body parts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 23:16:12 +10:00
cib
c11b765d2c Increased cost of cryo.
- It now uses twice as much oxygen
- Cryoxadone and clonexadone now heal brute, burn and oxyloss much slower, though cloneloss remains at the same speed.
2012-10-27 12:45:42 +02:00
Cael_Aislinn
0e279a3e34 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-27 20:44:54 +10:00
cib
b6e662a2e9 Cryo now just makes the air vanish, instead of overpressurizing medbay. 2012-10-27 12:39:21 +02:00
cib
7bf03bc920 Removed redundant code/modules/detectivework 2012-10-27 12:10:59 +02:00
Cael_Aislinn
e8b44dca13 made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 19:59:05 +10:00
Cael_Aislinn
1d1c907bfb made fire extinguishers not freeze everything
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-27 19:20:51 +10: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
Hawk-v3
a8d5e9e019 Merge pull request #1830 from theMIj/master
Xenoarch: artifacts, strange rocks, pretty orebox
2012-10-26 01:44:49 -07:00
Hawk-v3
98365e5996 Merge pull request #1832 from comma/master
Holsters and bunny slippers.
2012-10-25 15:30:48 -07:00
Spamcat
609c75fe58 Matches can be put in ashtrays as well. 2012-10-25 23:37:32 +04:00
Ater Ignis
55c553f535 1) show dismemberments on player: erase limbs which are ORGAN_DESTROYED
2) if player is husk - still try to overlay robotic limbs if they are present, but not anything else
3) human without legs can't stay, right? but he can crawl if there exist any part of arm or leg - only fully delimbed body can't move
2012-10-25 20:00:44 +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
Mij
e63277ee04 Fixed my ore box mistakes
Keeps strange rocks out of ore boxes. Actually changes sprites in the
correct place. >.>
2012-10-25 08:48:25 -07:00
Chinsky
9716049b4e Fixed derp. 2012-10-25 17:53:59 +04:00
Chinsky
eb72f2d48e Fixed couple of holster messages typos.
Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
2012-10-25 16:32:57 +04:00