cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,979 Commits 10 Branches 0 Tags
4a9c7b82ae1fdece280d1afeeaf9123f804a269a
Commit Graph

7669 Commits

Author SHA1 Message Date
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
Chinsky
5d62b98c18 Added 50% chance of thrown baton to stun mob 2012-11-05 14:46:00 +04: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
Ravensdale
19bca3e2ef Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm 2012-11-01 15:43:09 -07:00
Chinsky
7783ee2fbb Commented out Honker weapons. 2012-11-02 01:40:12 +04:00
Chinsky
203a4e1183 Merge branch 'disarm' 2012-11-02 01:22:31 +04:00
Ater Ignis
cbc31b9090 Adjustable timer for default grenades 2012-11-01 21:05:02 +04:00
Head
4cd33f3906 Just uh,fixes. 
Signed-off-by: Head <sebbebroberg@hotmail.com>
 2012-11-01 17:29:02 +01: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
Hawk-v3
bdf079af85 Merge pull request #1859 from AterIgnis/dismemberment 
Fix of recent pull 'Dismamberments'
 2012-11-01 02:13:41 -07:00
Ater Ignis
0171418661 fixed my misunderstanding of this programming language 2012-11-01 12:32:14 +04:00
Chinsky
b9d942cfdd Gun goes off in random direction instead of always on assiliant. 2012-11-01 04:14:23 +04:00
Chinsky
6d20c25cc1 Fixed custom welding helmets paths, making them act as welding helmets again. 2012-11-01 02:57:54 +04:00
Chinsky
f9a42f4ba9 ...debug print. 2012-11-01 00:31:36 +04:00
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