shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,279 Commits 5 Branches 0 Tags
4d247d88e6edfb7545b62d202d97628ec45360fa
Commit Graph

3948 Commits

Author SHA1 Message Date
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
deathride58
fb492b5a14 Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494 
[MIRROR] Fixes two unrelated runtimes
 2017-12-14 03:54:08 +00:00
deathride58
a4fafb2b51 Merge pull request #4357 from Citadel-Station-13/upstream-merge-33493 
[MIRROR] Fixes a couple Initialize procs
 2017-12-14 03:53:50 +00:00
deathride58
8f2d72ebc2 Merge pull request #4361 from Citadel-Station-13/upstream-merge-33497 
[MIRROR] Fixed several bad type checks in shuttle procs
 2017-12-14 03:53:32 +00:00
JStheguy
9313fd65cf Adds Additional Electronic_Assembly Designs (#33466) 
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
 2017-12-13 21:10:41 -06:00
Cruix
2afb3c0368 Fixed several bad type checks in shuttle procs (#33497) 2017-12-13 21:09:23 -06:00
deathride58
2e83779018 Update destructive_analyzer.dm 2017-12-13 16:49:05 -05:00
deathride58
b11d1c024e Merge pull request #4342 from Citadel-Station-13/upstream-merge-33496 
[MIRROR] Fixes lobby stat entries not showing
 2017-12-13 21:48:14 +00:00
deathride58
dbd08a18a4 Merge pull request #4349 from Citadel-Station-13/upstream-merge-33481 
[MIRROR] Correctly set description of nonstandard cells
 2017-12-13 21:47:57 +00:00
deathride58
a6220057be Update filingcabinet.dm 2017-12-13 16:47:29 -05:00
deathride58
da0ecad1ee Update order.dm 2017-12-13 16:47:00 -05:00
deathride58
81d30a08e6 Update cas.dm 2017-12-13 16:44:52 -05:00
deathride58
9f5cef7748 Update cas.dm 2017-12-13 16:44:34 -05:00
Leo
77aa84af1d Fixes a couple Initialize procs 2017-12-13 14:13:43 -06:00
Leo
27c06118cb Merge pull request #33478 from ACCount12/another_explosion_fix 
Fixes yet another chem explosion throwing warnings
 2017-12-13 14:13:36 -06:00
Leo
51cce087d8 Fixes two unrelated runtimes 2017-12-13 14:12:26 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58
dc7dd2da3c Update dead.dm 2017-12-13 12:05:09 -05:00
deathride58
e46811d210 Update cell.dm 2017-12-13 12:03:21 -05:00
Jordan Brown
129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
Kyle Spier-Swenson
73de2b7fe9 Changes the goonchat failed to load message since updating byond isn't needed anymore (#33474) 
It was a 511 beta that caused this issue, anybody still on 511 beta is not supported, They can move up to stable
 2017-12-12 22:51:21 -06:00
deathride58
046138b896 Merge pull request #4335 from Citadel-Station-13/upstream-merge-33458 
[MIRROR] Adds a chat command to reload admins in case someone locks themselves out.
 2017-12-13 01:24:36 +00:00
deathride58
6ad5b5030e Merge pull request #4343 from Citadel-Station-13/upstream-merge-33451 
[MIRROR] Fixes the free worker bee getting stuck in the hive and never leaving
 2017-12-13 01:24:01 +00:00
deathride58
6fc0cdc67e Merge pull request #4336 from Citadel-Station-13/upstream-merge-33457 
[MIRROR] Check ticks some more in dock()
 2017-12-13 01:22:52 +00:00
oranges
181afe9640 Fixes the free worker bee getting stuck in the hive and never leaving (#33451) 
ten outta ten code
 2017-12-12 15:57:49 -06:00
Jordan Brown
1bb487ebae Fixes lobby stat entries not showing 2017-12-12 15:56:38 -06:00
deathride58
5535509a65 fixes broken metabolism 2017-12-12 15:15:22 -05:00
Jordan Brown
367872f962 Merge pull request #33457 from ninjanomnom/check-your-tick 
Check ticks some more in dock()
 2017-12-12 13:05:49 -06:00
kevinz000
cc598d873c Adds a chat command to reload admins in case someone locks themselves out. (#33458) 
* Update chat_commands.dm

* skype
 2017-12-12 13:04:39 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
b5600cb91c Merge pull request #4328 from Citadel-Station-13/upstream-merge-33462 
[MIRROR] Ordered turfs quickfix
 2017-12-11 19:08:09 +00:00
Leo
9a0961c320 Merge pull request #33462 from ninjanomnom/dont-be-so-negative 
Ordered turfs quickfix
 2017-12-11 12:15:29 -06:00
kevinz000
d22aee94a1 Fixes nulls (#33440) 2017-12-11 11:31:27 -06:00
Jordan Brown
04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves 
Changes captain glove description
 2017-12-11 08:59:36 -06:00
deathride58
0389214c7b Update reagents.dm 2017-12-10 20:55:08 -05:00
ACCount
a4129f92df Fixes integrated circuit reagent components not working while in mobs, adds new helper procs 2017-12-10 19:38:06 -06:00
deathride58
051b45c680 Merge pull request #4254 from Citadel-Station-13/upstream-merge-33316 
[MIRROR] Adds games vendor resupply crate
 2017-12-11 00:46:00 +00:00
deathride58
fdefdef3e7 Merge pull request #4319 from Citadel-Station-13/upstream-merge-33428 
[MIRROR] Small Rebalance to hardsuit's armor ratings
 2017-12-11 00:20:56 +00:00
deathride58
71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424 
[MIRROR] Standardization of return_ordered_turfs
 2017-12-11 00:06:54 +00:00
deathride58
c211552c9d Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309 
[MIRROR] Silver slime extract foods now fry correctly
 2017-12-11 00:03:05 +00:00
deathride58
ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58
c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361 
[MIRROR] Removes juicers
 2017-12-10 23:49:41 +00:00
deathride58
6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276 
[MIRROR] Restores the uplink modules, removes LoadComponents
 2017-12-10 23:49:25 +00:00
FrozenGuy5
9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
Emmett Gaines
35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
coiax
6846e87ae2 Silver slime extract foods now fry correctly (#33309) 
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
 2017-12-10 17:42:20 -06:00
LetterJay
85578cae0d Merge pull request #4316 from deathride58/iconoverridefix 
Fixes icon_override only applying to uniforms
 2017-12-10 17:15:13 -06:00