shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,132 Commits 5 Branches 0 Tags
f7123f0f4bfb309ef2f474b55ec9fa2ea30a04a1
Commit Graph

5003 Commits

Author SHA1 Message Date
LetterJay
f7123f0f4b Merge pull request #3368 from Citadel-Station-13/upstream-merge-31623 
[MIRROR] Fixes Shambrero Penguin Names
 2017-10-14 10:18:43 -04:00
LetterJay
2e61af534e Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420 
[MIRROR] Bullet decals tweak
 2017-10-14 10:17:18 -04:00
LetterJay
8aebc3b15a Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909 
[MIRROR] Radiation rework and subsystem
 2017-10-13 23:58:04 -04:00
LetterJay
243e9d7acb Merge pull request #3362 from Citadel-Station-13/upstream-merge-31608 
[MIRROR] Fixes explosion particles causing a massive amount of runtimes
 2017-10-13 23:37:55 -04:00
LetterJay
e18e99f56f Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614 
[MIRROR] Fixes electrocution animation
 2017-10-13 23:37:46 -04:00
LetterJay
64b04b2c2f Merge pull request #3352 from Citadel-Station-13/upstream-merge-31631 
[MIRROR] Use legacy topic keywords lookup method
 2017-10-13 23:36:19 -04:00
LetterJay
aed26b120c Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584 
[MIRROR] Fixes ruins spawning over shuttle docks
 2017-10-13 23:36:10 -04:00
LetterJay
66585f242c Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512 
[MIRROR] Refactors away mission & space ruin area code.
 2017-10-13 23:36:01 -04:00
LetterJay
8360e8afd1 Merge pull request #3339 from Citadel-Station-13/upstream-merge-31557 
[MIRROR] Cleans up some direct loc setting-s in single tank bombs
 2017-10-13 23:35:52 -04:00
LetterJay
14dc8a5a35 Update life.dm 2017-10-13 12:30:35 -05:00
militaires
7f26d59541 Fixes Shambrero Penguin names 2017-10-13 11:55:48 -05:00
LetterJay
ce743f7d42 Update world.dm 2017-10-13 10:30:18 -05:00
LetterJay
2d66ab4171 Update life.dm 2017-10-13 10:26:25 -05:00
LetterJay
6e10c020ec Update syndieminibomb.dm 2017-10-13 10:26:07 -05:00
LetterJay
b9c07e7f66 Merge pull request #3363 from Citadel-Station-13/upstream-merge-31607 
[MIRROR] Fixes preferences generation
 2017-10-13 11:24:46 -04:00
nicbn
921b65ced0 Bullet decals tweak (#31420) 
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
 2017-10-13 09:47:10 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
kevinz000
c84a270403 Fixes preferences generation (#31607) 2017-10-13 09:16:03 -05:00
kevinz000
40a1ceed26 Fixes explosion particles causing a massive amount of runtimes (#31608) 2017-10-13 09:15:53 -05:00
Jordan Brown
1941a8fcfa Merge pull request #31614 from AnturK/zap 
Fixes electrocution animation
 2017-10-13 09:14:45 -05:00
Jordan Brown
9d448fda76 Merge pull request #31602 from AnturK/tunnels 
Fixes diagonal tunnels
 2017-10-13 09:14:34 -05:00
LetterJay
692e226d24 Merge pull request #3346 from Citadel-Station-13/upstream-merge-31621 
[MIRROR] Add require_comms_key = TRUE to some topic that need it
 2017-10-13 08:58:00 -04:00
LetterJay
da1eb3cd52 Merge branch 'master' into upstream-merge-31631 2017-10-13 08:31:13 -04:00
LetterJay
cd562a3c87 Update centcomAway.dm 2017-10-13 07:30:23 -05:00
LetterJay
09d929e9ca Merge branch 'master' into upstream-merge-31643 2017-10-13 07:59:09 -04:00
LetterJay
58b8a02802 Update gas_mixture.dm 2017-10-13 02:59:04 -05:00
LetterJay
1e5a6234aa Update ruins.dm 2017-10-13 02:58:26 -05:00
LetterJay
2e8b198d9a Merge branch 'master' into upstream-merge-31621 2017-10-13 03:58:03 -04:00
LetterJay
b08f278127 Merge pull request #3320 from Citadel-Station-13/upstream-merge-31580 
[MIRROR] Fixes init times
 2017-10-13 02:02:16 -04:00
LetterJay
5b292cebb3 Merge pull request #3344 from Citadel-Station-13/upstream-merge-31581 
[MIRROR] Fixes space transition (again)
 2017-10-13 02:02:04 -04:00
LetterJay
6f9d1893ca Merge pull request #3342 from Citadel-Station-13/upstream-merge-31396 
[MIRROR] Adds tick check to ore boxes
 2017-10-13 02:01:52 -04:00
LetterJay
fb444f173a Merge pull request #3351 from Citadel-Station-13/upstream-merge-31582 
[MIRROR] Notify admins when someone activates a smoke machine
 2017-10-13 02:00:46 -04:00
LetterJay
51f5d5423c Merge pull request #3358 from Citadel-Station-13/upstream-merge-31502 
[MIRROR] Adds a fireball from the heavens as an admin smite
 2017-10-13 00:21:01 -04:00
LetterJay
f488fa3ac3 Merge pull request #3356 from Citadel-Station-13/upstream-merge-31565 
[MIRROR] Stargazers are now station-restricted, and cogged APCs are now quiet
 2017-10-13 00:20:54 -04:00
LetterJay
f4852314dd Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588 
[MIRROR] Fixes stationary mob parallax
 2017-10-13 00:20:46 -04:00
LetterJay
b43a207390 Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586 
[MIRROR] Fixes canisters breaking multiple times
 2017-10-13 00:20:38 -04:00
LetterJay
116f06f428 Merge pull request #3348 from Citadel-Station-13/upstream-merge-31579 
[MIRROR] Fixes foam darts on cardboard cutouts and shooting range targets
 2017-10-13 00:07:14 -04:00
LetterJay
ea7b3d101d Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585 
[MIRROR] Fixes empty light fixtures showing as working lights in DM
 2017-10-13 00:06:06 -04:00
LetterJay
31914b7723 Merge pull request #3341 from Citadel-Station-13/upstream-merge-31549 
[MIRROR] Fixes plastic explosive issues
 2017-10-13 00:04:47 -04:00
LetterJay
b0f1ecda37 Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569 
[MIRROR] Fixes conveyor belt layering
 2017-10-12 23:55:05 -04:00
LetterJay
f072cac695 Merge pull request #3335 from Citadel-Station-13/upstream-merge-31618 
[MIRROR] Fixes topic key validation
 2017-10-12 23:54:03 -04:00
LetterJay
69d27f7231 Merge pull request #3334 from Citadel-Station-13/upstream-merge-31619 
[MIRROR] Fixes adminwho having namecheck as a keyword
 2017-10-12 23:50:00 -04:00
LetterJay
aaa76a47f5 Merge pull request #3333 from Citadel-Station-13/upstream-merge-31617 
[MIRROR] Fixes topic handlers
 2017-10-12 23:49:26 -04:00
LetterJay
25396db2df Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605 
[MIRROR] Fixes cryo
 2017-10-12 23:45:42 -04:00
LetterJay
d02dcb496e Merge pull request #3331 from Citadel-Station-13/upstream-merge-31542 
[MIRROR] makes vacuums "cold", sort of
 2017-10-12 23:40:55 -04:00
LetterJay
0263f44791 Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554 
[MIRROR] Fix lavaland turfs looking awkward to AIs
 2017-10-12 23:38:00 -04:00
LetterJay
3ee44b45f9 Merge pull request #3329 from Citadel-Station-13/upstream-merge-31556 
[MIRROR] Fixes client vv not working.
 2017-10-12 23:27:54 -04:00
LetterJay
b1232af6f5 Merge pull request #3327 from Citadel-Station-13/upstream-merge-31610 
[MIRROR] Fix world/Topic calling the wrong handler proc
 2017-10-12 23:25:34 -04:00
Armhulen
49d5d08456 Adds a fireball from the heavens as an admin smite (#31502) 
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
 2017-10-12 20:37:58 -05:00
Jordan Brown
14dcd3aee5 Activates global warming 2017-10-12 20:04:15 -05:00