shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,807 Commits 5 Branches 0 Tags
d0db0f0c854b0d0dd4aba3b61415285afd9ab563
Commit Graph

9995 Commits

Author SHA1 Message Date
LetterJay 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
LetterJay 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
LetterJay 82fd7e8067 Merge pull request #6431 from Citadel-Station-13/upstream-merge-37212 
[MIRROR] Parenthesizes some macros
 2018-04-22 02:39:43 -05:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 15829a658c Merge pull request #6448 from Citadel-Station-13/upstream-merge-37266 
[MIRROR] Fixes trophies.
 2018-04-22 02:33:40 -05:00
LetterJay 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
LetterJay 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
LetterJay 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
ShizCalev 79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
vuonojenmustaturska 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
81Denton 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
AnturK 68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
PKPenguin321 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
MrDoomBringer 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
kevinz000 6cd18fd5c5 My adventures in getFlatIcon performance (#36890) 2018-04-16 17:59:41 -05:00
Jordan Brown 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
Grandmother of 50 0fca7cf7f0 Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141) 
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
 2018-04-16 04:39:57 -05:00
vuonojenmustaturska ed201bc65d Gives mining bots back their mesons (#37196) 
* Gives mining bots back their mesons

* qdel
 2018-04-16 04:36:40 -05:00
pigeons 4d0597ad5b Parenthesizes some macros (#37212) 
* parenthesizes some macros

* A couple more macro definition parenthesizing
 2018-04-16 03:47:46 -05:00
Tad Hardesty 09cf7216b2 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 22:43:54 -05:00
Jordan Brown edf4488c6b Merge pull request #37201 from kevinz000/patch-483 
Adds missing arguments to eye insert procs
 2018-04-15 22:25:14 -05:00
Jordan Brown de896c2929 Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z 
Correct some pixel_z issues
 2018-04-15 22:23:58 -05:00
deathride58 f98040513a Merge pull request #6383 from Citadel-Station-13/upstream-merge-37113 
[MIRROR] Adds an period to point messages
 2018-04-16 03:05:00 +00:00
deathride58 ecc5ac9861 Merge pull request #6411 from Citadel-Station-13/upstream-merge-37055 
[MIRROR] Sender of PDA messages is told when their message is sent
 2018-04-16 02:51:36 +00:00
deathride58 542178548c Merge pull request #6412 from Citadel-Station-13/upstream-merge-37156 
[MIRROR] Stops silicons looping through world every login looking for flippin runes
 2018-04-16 02:51:13 +00:00
deathride58 28f8554614 Merge pull request #6413 from Citadel-Station-13/upstream-merge-37054 
[MIRROR] Reorganised component controls
 2018-04-16 02:50:50 +00:00
deathride58 88362a3d76 Merge pull request #6416 from Citadel-Station-13/upstream-merge-37190 
[MIRROR] [s] Fixes bluespace cookie centcom exploit
 2018-04-16 02:50:13 +00:00
deathride58 c10a3e38e2 Merge pull request #6417 from Citadel-Station-13/upstream-merge-37217 
[MIRROR] Stops ghosts from being able to start plasma fires
 2018-04-16 02:49:57 +00:00
deathride58 41af940981 Merge pull request #6418 from Citadel-Station-13/upstream-merge-37215 
[MIRROR] fixes borgs being able to control the CentCom ferry
 2018-04-16 02:49:38 +00:00
deathride58 87079e1ddb Merge pull request #6420 from Citadel-Station-13/upstream-merge-37220 
[MIRROR] Blacklists His Grace from the deep fryer
 2018-04-16 02:49:19 +00:00
deathride58 8749f88c87 Merge pull request #6421 from Citadel-Station-13/upstream-merge-37221 
[MIRROR] Allows passive gates to be interacted with in unpowered areas
 2018-04-16 02:49:00 +00:00
deathride58 36d1cc932c Merge pull request #6422 from Citadel-Station-13/upstream-merge-37224 
[MIRROR] Filters out duplicate trophies.
 2018-04-16 02:48:28 +00:00
deathride58 8110227bc3 Update living.dm 2018-04-15 22:46:55 -04:00
vuonojenmustaturska fbfac8ff36 Merge pull request #37233 from KorPhaeron/gps3 
Fixes BSA targetting offline GPS
 2018-04-15 16:01:10 -05:00
AnturK 15ac393773 Filters out duplicate trophies. 2018-04-15 12:42:41 -05:00
vuonojenmustaturska 472e7f7f61 Allows passive gates to be touched in unpowered areas 2018-04-15 12:41:28 -05:00
vuonojenmustaturska 64def88314 blacklist his grace from being deep-fried 2018-04-15 12:41:19 -05:00
vuonojenmustaturska afeae1e446 fixes borgs being able to send the ferry 2018-04-15 12:39:52 -05:00
vuonojenmustaturska da5812b07b Stops ghosts from being able to start plasma fires 2018-04-15 12:39:40 -05:00
vuonojenmustaturska fd521dbe1f Fixes bluespace cookie centcom exploit 2018-04-15 12:38:26 -05:00
John Ginnane e67467b919 Reorganised component controls (#37054) 
* Reorganised component controls

* Simplied menu further

Removed "rename" and "copy ref", renamed "remove" to just "-"

* Added similar changes to "built in" components and added "Rename"
 2018-04-15 04:31:16 -05:00
Jordan Brown 78f89423fe Merge pull request #37156 from ExcessiveUseOfCobblestone/patch-38 
Stops silicons looping through world every login looking for flippin runes
 2018-04-14 21:47:49 -05:00
John Ginnane d63b549302 Sender of PDA messages is told when their message is sent (#37055) 
* Adds "sent message" to the sender of PDA messages

* Added span to message
 2018-04-14 16:13:50 -05:00
deathride58 60a35c5270 Merge pull request #6409 from Citadel-Station-13/upstream-merge-37194 
[MIRROR] Fixes SCP being deconstructable
 2018-04-14 20:39:12 +00:00
deathride58 a3279d6de2 Merge pull request #6408 from Citadel-Station-13/upstream-merge-37095 
[MIRROR] sucessfully fixes some grammar
 2018-04-14 20:38:52 +00:00