cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,622 Commits 6 Branches 0 Tags
fe3c54d7c5b521de51a6fcafc1a52d94ffc938c2
Commit Graph

23544 Commits

Author SHA1 Message Date
JoanRisu
fe3c54d7c5 xcom fluff 1 2016-07-01 05:07:00 -07:00
JoanRisu
564d3a1ce6 The case of the backwards helmet. 2016-06-29 23:42:17 -07:00
Yoshax
e9b56deb40 Fixes a bug with tiny peeps 2016-06-30 02:55:18 +01:00
killer653
da250037d2 Ctrl C, Ctrl V doesn't always work 2016-06-25 23:02:52 -04:00
killer653
9bbcf5c8c6 Whoops! 2016-06-25 22:58:00 -04:00
killer653
6fd78fe69b This took 5 hours to fix 
...due to user error. It was a 5 minute fix that required 1 new line of
code.

Coding hurts.
 2016-06-25 22:31:58 -04:00
Spades
e56fc38403 Merge pull request #376 from viv-eret/master 
Adds tentacle taur sprites
 2016-06-24 18:49:40 -04:00
killer653
145da74b56 Removes a random space. 2016-06-22 22:46:59 -04:00
killer653
51debcf399 Allows hardsuits and rigsuits to store backpacks 2016-06-22 22:41:59 -04:00
Spades
3b249abdf9 Merge pull request #350 from Cameron653/master 
Adds in Xenochimeras (Scree Whitelisted race)
 2016-06-22 16:55:21 -04:00
viv-eret
841db7077b Added tentacle sprite code 2016-06-21 19:15:57 -07:00
Spades
a7f56a77d7 Merge pull request #369 from VOREStation/huddebug 
Hacky fix for HUD problems
 2016-06-20 15:25:39 -04:00
killer653
750958945c Small tweak 2016-06-20 15:14:07 -04:00
Spades
5d51bc48c4 Travis wake up. 2016-06-18 19:20:25 -04:00
Spades
c16257fd58 Travis wake up. 2016-06-18 19:19:29 -04:00
Cameron653
8ab0af947e Update station_vr.dm 2016-06-18 17:32:50 -04:00
Cameron653
cbd9abf37c Update station_vr.dm 2016-06-18 17:31:35 -04:00
Cameron653
9b4c967b23 Fixes! 2016-06-18 14:50:47 -04:00
Spades
05ce93721b Forgot one part. 2016-06-17 19:50:16 -04:00
Spades
1057034044 Fixes #371 2016-06-17 17:05:36 -04:00
Arokha Sieyes
cebf45e11b Hacky fix for HUD problems 
Teshari hud darkness overlay keeps getting deleted globally, and worse it keeps them from spawning after. This is a cheap fix to correct this, but I have no idea what's causing it in the first place.
 2016-06-16 01:34:40 -04:00
Cameron653
61d4aeced1 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-15 14:30:40 -04:00
Arokha Sieyes
aea0af7f16 Exclusive list add for safety 2016-06-15 00:10:01 -04:00
Arokha Sieyes
6de29e6b9b More Elegant 2016-06-15 00:00:16 -04:00
Arokha Sieyes
fa366e4b08 Fixes Vore 
- Makes belly modes stop duplicating themselves
- Fixes 'owner' var on belly which is where prey is moved when eaten
 2016-06-14 23:49:27 -04:00
Arokha Sieyes
07081327fa Merge pull request #362 from VOREStation/sync 
Polaris Sync
 2016-06-14 21:19:40 -04:00
Arokha Sieyes
3809e30a07 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/datums/supplypacks/science.dm
 2016-06-14 21:09:38 -04:00
Datraen
28872c5008 Merge pull request #1923 from Yoshax/supplygroups 
Adjusts cargo categories
 2016-06-14 21:07:37 -04:00
Arokha Sieyes
5d6eff7e57 Merge pull request #358 from VOREStation/sync 
Polaris Sync
 2016-06-14 19:29:43 -04:00
Arokha Sieyes
e591cadd7b Merge pull request #360 from VOREStation/gun-fetish 
PDW added
 2016-06-14 19:26:54 -04:00
Spades
f6871d2656 Almost forgot the AP rounds! 2016-06-14 17:41:47 -04:00
Spades
0433d9bf83 Derp. 2016-06-14 17:17:33 -04:00
Spades
1f48a98ba4 Official Vorestation SMG. *nodnod* 2016-06-14 17:16:29 -04:00
Spades
51be44fef0 PDW added 2016-06-14 17:11:57 -04:00
Arokha Sieyes
c15c4da829 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2016-06-14 16:48:00 -04:00
Yoshax
0d6381b3fc Merge pull request #1940 from SpadesNeil/deagle-fix 
Fixes #1918, and Desert Eagle empty icons added.
 2016-06-14 21:46:50 +01:00
Yoshax
2adf53d265 Merge pull request #1939 from VOREStation/emotestop 
Prevent lobby players from seeing emotes
 2016-06-14 21:46:36 +01:00
Spades
e650531dba Desert Eagle empty icons added. 2016-06-14 16:17:25 -04:00
Arokha Sieyes
cecd4c7a61 Prevent lobby players from seeing emotes 
Someone had already added a 'return-only' override for hear_say for new_player mobs to keep their ghostears from working in the lobby, however ghostsight/eyes/whateveritscalled has not worked as it should and it seems like nobody thought to add a show_message block for emotes.
 2016-06-14 16:08:53 -04:00
Arokha Sieyes
698a0e753d Disallows global OOC while voting 2016-06-14 15:37:01 -04:00
Arokha Sieyes
cb65295059 Fixes issues with update: 
Replaces glass boxes on map with new path
Removes duplicate code accepted into Polaris
Moves supplypacks_vr to science_vr
 2016-06-14 15:01:37 -04:00
Cameron653
7434b47902 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-14 14:13:43 -04:00
Cameron653
b162aefe92 Ahhhhhh 2016-06-14 14:09:51 -04:00
Cameron653
9ac44d196a Makes it so only the user gets the verbs 2016-06-14 14:05:48 -04:00
Yoshax
6eb523a998 Merge pull request #1936 from Mark9013100/6/14/2016ear_cards 
Allows cards to go on the ear slot
 2016-06-14 17:59:45 +01:00
Mark9013100
c0414d2917 Allows cards to go on the ear slot 2016-06-14 12:17:35 -04:00
Arokha Sieyes
0350a266d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/modules/client/preferences.dm
 2016-06-14 12:01:42 -04:00
Datraen
f099af2f77 Merge pull request #1928 from Leshana/pref-datums-copyto 
Move preferences copy_to() new player mobs into the preference_setup datums.
 2016-06-14 11:11:07 -04:00
Arokha Sieyes
47b97546b8 Dorms protect vs radiation for lewds 2016-06-14 00:40:11 -04:00
EmperorJon
388ec9cb11 Merge pull request #1931 from VOREStation/videocalls 
Adds actual video calls to communicators
 2016-06-14 01:31:40 +01:00