shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,151 Commits 5 Branches 0 Tags
32fb136bf00a970f8b1bed31182e5202a4e0b330
Commit Graph

507 Commits

Author SHA1 Message Date
vuonojenmustaturska
5bd7184d9c Deterministic output slots for smartfridges (#32225) 
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
 2017-10-30 14:35:26 -05:00
LetterJay
d182acae7f Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723 
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
 2017-10-29 04:22:03 -04:00
LetterJay
2503a90dc0 Merge pull request #3585 from Michiyamenotehifunana/CX-sword 
Adds fancy Energy Swords (and a toy version)
 2017-10-29 03:56:27 -04:00
LetterJay
d6c143c860 Merge pull request #3643 from Citadel-Station-13/upstream-merge-32121 
[MIRROR] Fixes motion cameras runtiming when a target is deleted before they are detected to be  leaving the range/dead.
 2017-10-29 03:44:55 -04:00
LetterJay
c62f6ec353 Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093 
[MIRROR] Roundstart species pref fixes/removes redundant species config
 2017-10-29 03:41:59 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
Ashe Higgs
37bb75a645 Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723) 
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
 2017-10-27 17:36:31 -05:00
kevinz000
1110cca542 Fixes motion runtimes from deleted targets (#32121) 2017-10-27 04:47:45 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJay
49fa09d1bd Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944 
[MIRROR] Atmos construction rework again
 2017-10-27 02:00:11 -04:00
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
CitadelStationBot
2f74805a46 [MIRROR] Fixes teleporters not actually denying teleports from Centcom (#3598) 
* Merge pull request #32043 from tgstation/Cyberboss-patch-3

Fixes teleporters not actually denying teleports from Centcom

* Fixes teleporters not actually denying teleports from Centcom
 2017-10-25 20:02:36 -05:00
deathride58
70a2c466f3 manual mirror of upstream robotic surgery pr 2017-10-25 14:29:45 -04:00
Michiyamenotehifunana
54a51a2fdb NEB Polishing 
Toys now implemented in a better way, new sound effects, and new traitor variant.
 2017-10-25 16:36:03 +08:00
LetterJay
98fbe6e813 Update shutters.dm 2017-10-24 15:26:28 -05:00
ShizCalev
889d2ba74e Moves opened firedoors underneath opened airlocks 2017-10-24 00:05:43 -05:00
LetterJay
00da8a2ead Merge pull request #3575 from deathride58/mapsyncs1 
Map Syncs - TG-gnawed-on-too-many-cables Edition
 2017-10-23 23:02:23 -04:00
LetterJay
6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
duncathan salt
ed12370a73 Atmos construction rework again 2017-10-23 16:29:53 -05:00
LetterJay
3243eaa6b8 Merge pull request #3573 from Citadel-Station-13/upstream-merge-32003 
[MIRROR] fixes AIs being able to teleport the id card console inserted cards to their core
 2017-10-23 16:54:57 -04:00
LetterJay
ad3bafcb42 Update motion.dm 2017-10-23 14:16:15 -05:00
LetterJay
9367eb23c5 Update iv_drip.dm 2017-10-23 14:15:20 -05:00
vuonojenmustaturska
636ab7d156 Removes mob references from camera motion tracking 2017-10-23 13:32:32 -05:00
deathride58
c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00
kevinz000
f4e0eab993 fixes AIs being able to teleport the id card console inserted cards to their core (#32003) 
* Update card.dm

* Update card.dm
 2017-10-23 08:59:24 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
LetterJay
095839becf Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969 
[MIRROR] Gets rids of spawns in airlock code
 2017-10-23 04:05:19 -04:00
LetterJay
8b4c183a26 Update lightswitch.dm 2017-10-22 10:55:52 -05:00
MoreRobustThanYou
26d6e9e67b Gets rids of spawns in airlock code (#31969) 
* Gets rids of spawns in airlock code

* Update airlock.dm
 2017-10-22 00:16:54 -05:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
CitadelStationBot
46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513) 
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
 2017-10-20 01:40:15 -05:00
LetterJay
72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819 
[MIRROR] Fixes AI visiblity checks
 2017-10-19 09:24:28 -04:00
LetterJay
b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753 
[MIRROR] Radiation makes you vomit blood and some more balance changes
 2017-10-19 08:57:18 -04:00
YPOQ
d04818e6f9 Fixes AI visiblity checks (#31819) 2017-10-19 05:42:52 -05:00
Poojawa
45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
CitadelStationBot
7f9d13ab42 [MIRROR] Removes 200mb of wasted memory usage (#3472) 
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again

Removes 200mb of wasted memory usage

* Removes 200mb of wasted memory usage
 2017-10-17 22:18:19 -05:00
LetterJay
db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972 
[MIRROR] Atmospherics Multilayer Pipes
 2017-10-17 08:58:10 -04:00
kevinz000
a41725a955 Atmospherics Multilayer Pipes (#30972) 
* 1

* rpd

* 3

* 4

* 5

* 6

* 7

* 8

* wew

* src. and underlays

* update

* woops

* misspelled params

* reviews

* fixes

* fixes

* better checks and layer crap

* Update RPD.dm

* Update pipe_construction.dm

* 3 layers, fixes

* woops i didn't update defines correctly

* dunc

* Fixes

* Fixes

* fixes

* fixes some more bullshit

* fixes

* fixes

* not needed

* makes attachment sprites prettier or uglier i dunno

* Unary flag

* sprite fix??

* fixes...

* sprite fixes
 2017-10-17 00:49:12 -05:00
vuonojenmustaturska
af81a902fd Fixes some copypasted airlocks referring to nonexistent overlay sprites (#31741) 2017-10-16 16:48:52 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
LetterJay
499254761c Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671 
[MIRROR] ID ejecting from computers by alt-clicking
 2017-10-15 10:22:04 -04:00