cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,091 Commits 7 Branches 0 Tags
e92cecdefe706d6e20bfd5e1776c811486e8a002
Commit Graph

7736 Commits

Author SHA1 Message Date
Chinsky
771389f871 Added warning messages before vomiting. 
You have in total two warnings and to react now.
 2012-10-31 14:36:09 +04:00
Chinsky
e1c087c594 Added small probality of gun owner getting shot. 2012-10-31 14:34:52 +04:00
Chinsky
29fab30384 Added 40% chance of gun in active hand going off if someone tries to disarm holder. 
There is also 10% chance that gun in off hand will go off.
 2012-10-31 13:04:34 +04:00
Chinsky
a2e83e962d Alternative titles system. 
Custom character records.
Different clothing for alternative titles.
 2012-10-31 08:40:51 +04:00
Cael_Aislinn
38e127f2c4 made invisimin change the mob sprite 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-31 14:02:14 +10:00
Cael_Aislinn
b6366daa9a reduced alien infestation random event chance, down to less than 1% every five minutes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-31 11:00:22 +10:00
Chinsky
9dc654c712 Beep boop cyborg emotes. 
All ported and working.
Ping, beep, buzz, THE LAW.
 2012-10-31 03:24:31 +04:00
Chinsky
d2bf021e7d Cleaned up walllocker code. 
Emergency lockers are ready to be used.
 2012-10-31 02:00:39 +04:00
Chinsky
2ab5564ca7 Removed HONK mech parts from fabricator menu. 
Honk.
 2012-10-31 01:55:15 +04:00
Cael_Aislinn
6bda733e37 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-30 23:53:42 +10:00
Cael_Aislinn
698425a987 readd ssd sleep 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-30 23:46:54 +10:00
Cael_Aislinn
5c82c87aa2 removed silly comments 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-30 23:44:57 +10:00
Mloc
5049fa1b83 Merge pull request #1852 from comma/master 
Custom items, limbs and small fixes.
 2012-10-30 05:29:59 -07:00
Chinsky
b30ba9314c Reverted changes by 'dismemberment fix' 
It's a bit misleading, but you can just set base icon to limbless torso, so no need to subtract every missing limb from there.
Subtracting will cause mob have see-through holes when seen from the side too.
 2012-10-30 16:02:10 +04:00
Chinsky
77800a76d7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-30 15:30:40 +04:00
Chinsky
a5cdbf1a1f Readded robolimbs beign affected by EMP 2012-10-30 08:07:45 +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
3583d78a45 Made stronger EMP pulses have BIGGER chance of exploding robolimb. It was backwards for some reason, so weak pulses had higher chance of explosion. 2012-10-30 07:56:43 +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
7d5ee4cdf5 Fixes AI-less borgs spawning with asimov instead of corporate lawset. 2012-10-29 17:13:50 -07: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
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