cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,020 Commits 5 Branches 0 Tags
a114c79acab9a231184d714ad6faebc88f6c1ccc
Commit Graph

4651 Commits

Author SHA1 Message Date
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
a02a337fed Added option to call crew transfer to Comms computers. 2012-11-06 22:38:02 +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
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
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
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
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
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
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
a2e83e962d Alternative titles system. 
Custom character records.
Different clothing for alternative titles.
 2012-10-31 08:40:51 +04: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
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
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
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
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
299c8d6433 Merge pull request #1848 from Hawk-v3/master 
Cryo edit. No More Alien Race Damage.
 2012-10-28 03:31:39 -07:00