shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,479 Commits 5 Branches 0 Tags
f21cac1af2f973886c19bdb3691d6a67cf5dc115
Commit Graph

16479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay f21cac1af2 Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399 
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
 2018-05-12 17:04:23 -05:00
deathride58 20ac9089a7 Merge pull request #6678 from Citadel-Station-13/upstream-merge-37710 
[MIRROR] Makes eye of god lava & fire proof
 2018-05-11 03:45:28 +00:00
deathride58 37b9d589ad Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396 
[MIRROR] Track admin observer time
 2018-05-11 03:45:11 +00:00
deathride58 a980e323b9 Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727 
[MIRROR] [s] Removes some stationloving-related failure surface
 2018-05-11 03:44:29 +00:00
deathride58 993d72ec46 Merge pull request #6681 from Citadel-Station-13/upstream-merge-37438 
[MIRROR] [READY] Properly Adds a suicide action to the hand tele
 2018-05-11 03:44:06 +00:00
deathride58 67d79f4e3e Update admins.txt 2018-05-10 23:43:49 -04:00
deathride58 ebcb0c45fe Merge pull request #6683 from Citadel-Station-13/upstream-merge-37571 
[MIRROR] Integrated Circuits: String parsing update
 2018-05-11 03:42:12 +00:00
deathride58 8954754e7a Merge pull request #6684 from Citadel-Station-13/upstream-merge-37683 
[MIRROR] Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values.
 2018-05-11 03:41:53 +00:00
deathride58 e0f971ecbb Merge pull request #6693 from Citadel-Station-13/upstream-merge-37457 
[MIRROR] Adds a French beret! HONH HONH HONH!
 2018-05-11 03:41:26 +00:00
deathride58 aabd098e2e Merge pull request #6695 from Citadel-Station-13/upstream-merge-37709 
[MIRROR] Adds emag_act feedback msg to battle arcade machine
 2018-05-11 03:40:41 +00:00
deathride58 4364d2bff5 Merge pull request #6696 from Citadel-Station-13/upstream-merge-37689 
[MIRROR] Makes it a bit easier to see radiation with engine goggles
 2018-05-11 03:40:10 +00:00
deathride58 19d09b4b2d Merge pull request #6697 from Citadel-Station-13/upstream-merge-37718 
[MIRROR] Distinguish between DNA and ID when failing to enter a mech
 2018-05-11 03:39:50 +00:00
deathride58 852d2a529e Merge pull request #6698 from Citadel-Station-13/upstream-merge-37548 
[MIRROR] fixes some inconsistency in the bulldog shotgun ammo
 2018-05-11 03:39:31 +00:00
deathride58 93aa92820d Merge pull request #6701 from Citadel-Station-13/upstream-merge-37770 
[MIRROR] Fixes anomalies not listening on the correct frequency
 2018-05-11 03:38:38 +00:00
deathride58 65492ba8ca Update rpd.ract 2018-05-10 23:37:49 -04:00
deathride58 7acf54f5fc Update misc.dm 2018-05-10 23:37:20 -04:00
deathride58 e0bceb405f Merge pull request #6702 from Citadel-Station-13/upstream-merge-37735 
[MIRROR] improves pda message immersion
 2018-05-11 03:36:22 +00:00
deathride58 b38424653c Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656 
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
 2018-05-11 03:36:01 +00:00
deathride58 d0dc769b53 Merge pull request #6705 from Citadel-Station-13/upstream-merge-37726 
[MIRROR] Stops qdeleted objects from taking damage.
 2018-05-11 03:35:35 +00:00
deathride58 0ec6c3f853 Merge pull request #6708 from Citadel-Station-13/upstream-merge-37761 
[MIRROR] Adds time_dilation info to status topic.
 2018-05-11 03:34:21 +00:00
deathride58 f2e7c305a5 Merge pull request #6709 from Citadel-Station-13/upstream-merge-37748 
[MIRROR] brings gender equality on /tg/station
 2018-05-11 03:33:57 +00:00
deathride58 e1ee25d5d9 Merge pull request #6710 from Citadel-Station-13/upstream-merge-37762 
[MIRROR] Fixes gorillas not having hand slots
 2018-05-11 03:33:21 +00:00
letterjay 14fc42635a Fixes gorillas not having hand slots 2018-05-10 20:52:39 -05:00
YPOQ afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
letterjay b1eba42b97 brings gender equality on /tg/station 2018-05-10 19:57:20 -05:00
Tlaltecuhtli 4a8df6a701 Bring gender equality to Corgi crates (#37748) 
* brings gender equality on /tg/station
* what if this works
 2018-05-10 19:57:20 -05:00
letterjay 255499c2c9 Adds time_dilation info to status topic. 2018-05-10 15:50:59 -05:00
Jordan Brown ed41769e10 Merge pull request #37761 from MrStonedOne/patch-503 
Adds time_dilation info to status topic.
 2018-05-10 15:50:59 -05:00
LetterJay 8948acfce2 Merge pull request #6691 from Citadel-Station-13/upstream-merge-37753 
[MIRROR] Makes the cultblade use the right inhand files
 2018-05-10 10:12:56 -05:00
LetterJay 0e27471a77 Merge pull request #6690 from Citadel-Station-13/upstream-merge-37704 
[MIRROR] Adds drone hats for some holidays
 2018-05-10 10:12:08 -05:00
letterjay f42b21d852 Stops qdeleted objects from taking damage. 2018-05-10 02:30:01 -05:00
AnturK 096a8a63c5 Stops qdeleted objects from taking damage. (#37726) 
* Stops qdeleted objects from taking damage.

* Some logging.
 2018-05-10 02:30:01 -05:00
letterjay 7cfdee8289 Fixes EMPs not working on people/backpacks/other storage being carried on people 2018-05-10 01:33:25 -05:00
kevinz000 3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
letterjay 4cde22d86f improves pda message immersion 2018-05-10 01:08:37 -05:00
Iamgoofball 278ecd5d06 improves pda message immersion (#37735) 2018-05-10 01:08:37 -05:00
LetterJay 4533b983f6 Merge pull request #6689 from Citadel-Station-13/upstream-merge-37693 
[MIRROR] Fixes singuloth not disappearing after a set amount of time.
 2018-05-10 00:49:06 -05:00
LetterJay dd25b15115 Merge pull request #6688 from Citadel-Station-13/upstream-merge-37721 
[MIRROR] Fixes edge case with crew pinpointers
 2018-05-10 00:46:38 -05:00
LetterJay ff3071b25f Merge pull request #6687 from Citadel-Station-13/upstream-merge-37747 
[MIRROR] fixes a money loop
 2018-05-10 00:46:24 -05:00
letterjay 2b85cb8cb5 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
YPOQ f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
Tad Hardesty 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
letterjay 04f52ce950 fixes some inconsistency in the bulldog shotgun ammo 2018-05-09 16:24:18 -05:00
Tlaltecuhtli 325b31f11e fixes some inconsistency in the bulldog shotgun ammo (#37548) 
the default bulldog shotgun ammo makes sense now
 2018-05-09 16:24:17 -05:00
letterjay 259485811b Distinguish between DNA and ID when failing to enter a mech 2018-05-09 16:22:03 -05:00
Tad Hardesty a1db36f316 Distinguish between DNA and ID when failing to enter a mech 2018-05-09 16:22:03 -05:00
letterjay dd923475f3 Makes it a bit easier to see radiation with engine goggles 2018-05-09 16:20:49 -05:00
kevinz000 44dac80383 Makes it a bit easier to see radiation 2018-05-09 16:20:48 -05:00
letterjay c8db2459a6 Adds emag_act feedback msg to battle arcade machine 2018-05-09 16:19:33 -05:00
Denton c34cf3d67f Hit it! They call me Cuban Pete I'm the king of the Rumba beat When I play the maracas I go Chic-chic-ky-boom Chic-chic-ky-boom Yes sir, I'm Cuban Pete I'm the craze of my native street When I start to dance everything goes Chic-chic-ky-boom Chic-chic-ky-boom The senioritas they sing And they swing with "terampero" It's very nice! So full of spice! And when they dance in they bring A happy ring that "era keros" Are singing a song All the day long So if you like the beat Take a lesson from Cuban Pete And I'll teach you to Chic-chic-ky-boom Chic-chic-ky-boom Chic-chic-ky-boom He's a really modest guy Although he's the hottest guy In Havana, in Havana Si, senorita I know That you would like a Chic-ky-boom-chick It's very nice - so full of spice I'll place my hand on your hip And if you will just give me your hand Then we shall try Just you and I "Iy-yi-yi!" "Shake your booty, daddy, wow! See ya'!" 2018-05-09 16:19:33 -05:00