shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,829 Commits 5 Branches 0 Tags
5688049a7c10e5d542db1458a1be54a63cb8812a
Commit Graph
15829 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 5688049a7c Merge pull request #6454 from Citadel-Station-13/upstream-merge-37246 
[MIRROR] Removes href log from admin investigate
 2018-04-22 02:45:14 -05:00
LetterJayandGitHub 8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00
LetterJayandGitHub 675243f95e Merge pull request #6449 from Citadel-Station-13/thefuckarethesenumbers 
Rebalances pump-action energy shotguns
 2018-04-22 02:44:40 -05:00
LetterJayandGitHub 68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223 
[MIRROR] Fixes some defines and value
 2018-04-22 02:43:26 -05:00
LetterJayandGitHub 26cb8d0fe3 Merge pull request #6439 from Citadel-Station-13/upstream-merge-37236 
[MIRROR] .. > ... moodie grammar fix
 2018-04-22 02:43:09 -05:00
LetterJayandGitHub 76001518d8 Merge pull request #6438 from Citadel-Station-13/upstream-merge-37209 
[MIRROR] Makes admin loaded shuttles work again
 2018-04-22 02:42:28 -05:00
LetterJayandGitHub e30d3540b1 Merge pull request #6437 from Citadel-Station-13/upstream-merge-37214 
[MIRROR] Fixes adjusting brain damage.
 2018-04-22 02:42:13 -05:00
LetterJayandGitHub d0db0f0c85 Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141 
[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
 2018-04-22 02:41:57 -05:00
LetterJayandGitHub c6d5050fe7 Merge pull request #6435 from Citadel-Station-13/upstream-merge-37196 
[MIRROR] Gives mining bots back their mesons
 2018-04-22 02:41:25 -05:00
LetterJayandGitHub 11b90af942 Merge pull request #6434 from Citadel-Station-13/upstream-merge-37193 
[MIRROR] Fixes runtime condenser
 2018-04-22 02:40:02 -05:00
LetterJayandGitHub 82fd7e8067 Merge pull request #6431 from Citadel-Station-13/upstream-merge-37212 
[MIRROR] Parenthesizes some macros
 2018-04-22 02:39:43 -05:00
LetterJayandGitHub ca7bc589d9 Merge pull request #6429 from Citadel-Station-13/upstream-merge-37207 
[MIRROR] Fix grammar in lightbulb shatter message
 2018-04-22 02:39:18 -05:00
LetterJayandGitHub b4b41d33cf Merge pull request #6428 from Citadel-Station-13/upstream-merge-37204 
[MIRROR] Add missing bio suit on-body icon
 2018-04-22 02:38:58 -05:00
LetterJayandGitHub 7bf009b52c Merge pull request #6427 from Citadel-Station-13/upstream-merge-37201 
[MIRROR] Adds missing arguments to eye insert procs
 2018-04-22 02:38:39 -05:00
LetterJayandGitHub bc0afc3c09 Merge pull request #6426 from Citadel-Station-13/upstream-merge-37206 
[MIRROR] Correct some pixel_z issues
 2018-04-22 02:37:42 -05:00
LetterJayandGitHub d2ce7da6cb Merge pull request #6453 from Citadel-Station-13/upstream-merge-37251 
[MIRROR] Adds new window spawners
 2018-04-22 02:35:09 -05:00
LetterJayandGitHub 96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218 
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
 2018-04-22 02:34:53 -05:00
LetterJayandGitHub 80f4522967 Merge pull request #6450 from Citadel-Station-13/upstream-merge-37252 
[MIRROR] Fixes lavaland syndie base rads + SSU compartment issues
 2018-04-22 02:34:03 -05:00
LetterJayandGitHub 15829a658c Merge pull request #6448 from Citadel-Station-13/upstream-merge-37266 
[MIRROR] Fixes trophies.
 2018-04-22 02:33:40 -05:00
LetterJayandGitHub 3d4acf38a1 Merge pull request #6446 from Citadel-Station-13/upstream-merge-37216 
[MIRROR] Esword cig lighting messages fix
 2018-04-22 02:32:53 -05:00
LetterJayandGitHub 3635cd9c71 Merge pull request #6445 from Citadel-Station-13/upstream-merge-37239 
[MIRROR] fixes fuckup in expressconsole preventing packs being ordered when credits are low
 2018-04-22 02:32:38 -05:00
LetterJayandGitHub d4538ce920 Merge pull request #6443 from Citadel-Station-13/upstream-merge-37229 
[MIRROR] Add team objective support to the centcom antag datum
 2018-04-22 02:30:55 -05:00
LetterJayandGitHub 250a818fe6 Merge pull request #6444 from Citadel-Station-13/upstream-merge-36890 
[MIRROR] [READY] getFlatIcon performance!
 2018-04-22 02:30:28 -05:00
CitadelStationBot d108361200 Removes href log from admin investigate 2018-04-18 15:46:16 -05:00
JordieandCitadelStationBot 8ee5092210 removes href log from admin investigate 2018-04-18 15:46:16 -05:00
CitadelStationBot 77998ff84d Adds new window spawners 2018-04-18 13:51:54 -05:00
ShizCalevandCitadelStationBot 79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
CitadelStationBot 8f1cd52a36 Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction 2018-04-18 11:34:06 -05:00
Jordan BrownandCitadelStationBot 44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
CitadelStationBot 0c27bf95eb Couple of fixes for situations involving mechas and the clock cult gamemode 2018-04-18 09:33:31 -05:00
vuonojenmustaturskaandCitadelStationBot 32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218) 
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
 2018-04-18 09:33:31 -05:00
CitadelStationBot e0181c4246 Fixes lavaland syndie base rads + SSU compartment issues 2018-04-18 07:02:10 -05:00
81DentonandCitadelStationBot 7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252) 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
 2018-04-18 07:02:10 -05:00
deathride58andGitHub 5f37b59107 on second thought, the cell usage change is a little dumb, the stamloss per watt isnt much different from its original value 2018-04-17 22:32:25 -04:00
deathride58andGitHub 521cc43664 makes pump-disabler slug slightly more cell-efficient than pump-disabler spread 2018-04-17 21:26:00 -04:00
deathride58andGitHub 9678de1f2f the fuck are these numbers 2018-04-17 21:17:54 -04:00
CitadelStationBot 87aacbad98 Fixes trophies. 2018-04-17 05:25:41 -05:00
AnturKandCitadelStationBot 68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
CitadelStationBot e9a9cca791 Esword cig lighting messages fix 2018-04-16 19:20:26 -05:00
PKPenguin321andCitadelStationBot ddb6f7ebae Esword cig lighting messages fix (#37216) 
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
 2018-04-16 19:20:26 -05:00
CitadelStationBot 4930cf61c5 fixes fuckup in expressconsole preventing packs being ordered when credits are low 2018-04-16 19:14:08 -05:00
MrDoomBringerandCitadelStationBot 846aa734e8 fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
 2018-04-16 19:14:08 -05:00
CitadelStationBot a047a0fbe6 [READY] getFlatIcon performance! 2018-04-16 17:59:41 -05:00
kevinz000andCitadelStationBot 6cd18fd5c5 My adventures in getFlatIcon performance (#36890) 2018-04-16 17:59:41 -05:00
CitadelStationBot 9105821d6b Add team objective support to the centcom antag datum 2018-04-16 16:17:42 -05:00
Jordan BrownandCitadelStationBot 889f8ddb06 Merge pull request #37229 from vuonojenmustaturska/centcommission 
Add team objective support to the centcom antag datum
 2018-04-16 16:17:42 -05:00
CitadelStationBot 2b52ff848e Fixes some defines and value 2018-04-16 08:32:48 -05:00
AnturKandCitadelStationBot 31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
CitadelStationBot 922ec894c5 .. > ... moodie grammar fix 2018-04-16 07:45:28 -05:00
ArmhulenandCitadelStationBot 5cbff26d24 Grammar (#37236) 2018-04-16 07:45:28 -05:00