shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,693 Commits 5 Branches 0 Tags
4e9cff854de6dd96a60be88744dba4103a0b526e
Commit Graph
14693 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandPoojawa 4e9cff854d [MIRROR] Turrets can be set to shoot people without loyalty implants (#5888) 
* Turrets can be set to shoot people without loyalty implants (#36226)

* adds feature to turrets allowing them to be toggled to shoot people who have not been loyalty implanted

* Fixed mistake left when changing variable names

* Turrets can be set to shoot people without loyalty implants
 2018-03-10 07:36:00 -06:00
CitadelStationBot ea8c1a0446 Automatic changelog generation for PR #5881 [ci skip] 2018-03-10 07:35:11 -06:00
CitadelStationBotandPoojawa b03917057b [MIRROR] Removes the smoke machine from roundstart chemistry (#5881) 
* Unmaps the smoke machine (#36260)

* Removes the smoke machine from roundstart chemistry
 2018-03-10 07:35:09 -06:00
CitadelStationBot dca0a1b2b9 Automatic changelog generation for PR #5889 [ci skip] 2018-03-10 07:34:30 -06:00
CitadelStationBotandPoojawa d97c2bc134 [MIRROR] Constructed turbines now properly connect_to_network() (#5889) 
* Constructed turbines now properly connect_to_network() (#36222)

* Constructed turbines now properly connect_to_network()
 2018-03-10 07:34:28 -06:00
CitadelStationBot fc612994e8 Automatic changelog generation for PR #5887 [ci skip] 2018-03-10 07:33:50 -06:00
CitadelStationBotandPoojawa 7b0570f394 [MIRROR] Fixes bodies responding to phobias (#5887) 
* Fixes bodies responding to phobias (#36227)

* Fixes ghosts responding to phobias
When a ghost inhabiting their body hears a phobia word, they no longer
freak out.

* Modified to a guard clause

* Fixes bodies responding to phobias
 2018-03-10 07:33:48 -06:00
CitadelStationBotandPoojawa 75160fb5b0 [MIRROR] Slightly optimizes adjust_clockwork_power (#5884) 
* Slightly optimizes adjust_clockwork_power (#36250)

* optimizations

* Update power_helpers.dm

* Slightly optimizes adjust_clockwork_power
 2018-03-10 07:33:22 -06:00
CitadelStationBotandPoojawa a999863e5c [MIRROR] Fixes mirror var desync (#5883) 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
 2018-03-10 07:17:52 -06:00
CitadelStationBotandPoojawa 2aa4fef8e1 [MIRROR] Tidy Processor Overload event code (#5876) 
* Tidy Processor Overload event code (#36277)

* Tidy Processor Overload event code
 2018-03-10 07:17:25 -06:00
CitadelStationBotandPoojawa 4b550b40e8 [MIRROR] Fixes some traits runtimes that are being spammed (#5875) 
* .len runtime fix (#36275)

* Fixes some traits runtimes that are being spammed
 2018-03-10 07:12:55 -06:00
PoojawaandGitHub 9785222155 tweaks Tesla Point income (#5849) 
* reigns in excessive point creep

* actually do math on this shit.
 2018-03-10 07:12:24 -06:00
CitadelStationBot 18183c42b9 Automatic changelog generation for PR #5882 [ci skip] 2018-03-10 06:55:14 -06:00
CitadelStationBotandPoojawa b7e666ff23 [MIRROR] Fixes science scaling to decrease materials rather than increase.... (#5882) 
* Fixes scaling displays (#36253)

* Fixes science scaling to decrease materials rather than increase....
 2018-03-10 06:55:12 -06:00
CitadelStationBot bfaf737aaf Automatic changelog generation for PR #5872 [ci skip] 2018-03-09 16:10:25 -06:00
deathride58andGitHub b587eb32c0 Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254 
[MIRROR] Disables advanced shuttle navigation consoles during nuclear war ops
 2018-03-09 22:10:22 +00:00
deathride58andGitHub 4a57497b46 Merge pull request #5856 from Citadel-Station-13/upstream-merge-36242 
[MIRROR] Small moodie balance changes
 2018-03-09 20:58:55 +00:00
deathride58 6d91d7d438 fixes bad mirror 2018-03-09 15:58:25 -05:00
CitadelStationBot b06f06ac8c Automatic changelog generation for PR #5873 [ci skip] 2018-03-09 14:41:29 -06:00
deathride58andGitHub cc33872399 Merge pull request #5873 from Citadel-Station-13/upstream-merge-36083 
[MIRROR] Pillbottles can now be made
 2018-03-09 20:41:26 +00:00
deathride58andGitHub a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
CitadelStationBot ce0b0127a9 Automatic changelog generation for PR #5853 [ci skip] 2018-03-09 14:37:00 -06:00
deathride58andGitHub 2c34acc034 Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475 
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
 2018-03-09 20:36:58 +00:00
CitadelStationBot 96664278d4 Pillbottles can now be made 2018-03-09 14:24:35 -06:00
Mark9013100andCitadelStationBot 2686699c3e Pillbottles can now be made (#36083) 2018-03-09 14:24:35 -06:00
deathride58andGitHub 28e6c899b2 Update navigation_computer.dm 2018-03-09 14:39:51 -05:00
CitadelStationBot 0aecef50e9 Automatic changelog generation for PR #5871 [ci skip] 2018-03-09 13:39:31 -06:00
deathride58andGitHub 6b8213fff1 Merge pull request #5871 from Citadel-Station-13/upstream-merge-36258 
[MIRROR] Makes the smoke machine deconstructable
 2018-03-09 19:39:28 +00:00
deathride58andGitHub a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
CitadelStationBot 9d6e9a0397 Automatic changelog generation for PR #5857 [ci skip] 2018-03-09 13:24:37 -06:00
deathride58andGitHub bc5447d97b Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947 
[MIRROR] [READY] NTNet airlocks
 2018-03-09 19:24:35 +00:00
deathride58 c66b390cc1 Moves arousal meter to compensate for mood display 2018-03-09 14:23:49 -05:00
deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
vuonojenmustaturskaandCitadelStationBot f8d783ae70 Disables advanced shuttle navigation consoles during nuclear war ops 2018-03-09 12:49:44 -06:00
CitadelStationBot ce7cf03183 Makes the smoke machine deconstructable 2018-03-09 12:48:31 -06:00
Jordan BrownandCitadelStationBot 7650336507 Merge pull request #36258 from vuonojenmustaturska/bepis 
Makes the smoke machine deconstructable
 2018-03-09 12:48:31 -06:00
CitadelStationBot e62f090dad Automatic changelog generation for PR #5843 [ci skip] 2018-03-09 12:46:13 -06:00
deathride58andGitHub 45b473f14d Merge pull request #5843 from Poojawa/trek-outfits 
Trek outfits
 2018-03-09 18:46:11 +00:00
CitadelStationBot 9f976c4574 Automatic changelog generation for PR #5827 [ci skip] 2018-03-09 12:44:07 -06:00
deathride58andGitHub 32812ce624 Merge pull request #5827 from NopeMcHaltman/goddamnit 
Nymphotrait
 2018-03-09 18:44:05 +00:00
CitadelStationBot 8ebc32cae1 Automatic changelog generation for PR #5830 [ci skip] 2018-03-09 12:43:37 -06:00
deathride58andGitHub 5743ce2222 Merge pull request #5830 from Zna12/Biodegradable-Darts 
Degradable Darts, Citadel Style
 2018-03-09 18:43:35 +00:00
deathride58andGitHub 31d7baf516 Update runtimestation.dmm 2018-03-09 13:43:12 -05:00
CitadelStationBot 3a8c6c1651 Automatic changelog generation for PR #5850 [ci skip] 2018-03-09 12:41:08 -06:00
deathride58andGitHub aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070 
[MIRROR] Beacons are no longer radios
 2018-03-09 18:41:05 +00:00
deathride58andGitHub c615d9e6a0 Merge pull request #5870 from Citadel-Station-13/upstream-merge-36252 
[MIRROR] Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
 2018-03-09 18:40:24 +00:00
deathride58andGitHub fdbd8aec97 Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288 
[MIRROR] You can no longer SDQL select certain datums
 2018-03-09 18:40:09 +00:00
deathride58andGitHub a4751b0e94 Merge pull request #5868 from Citadel-Station-13/upstream-merge-36289 
[MIRROR] [s] Stop qdeling shit you're not supposed to
 2018-03-09 18:39:51 +00:00
deathride58andGitHub 2a92653e68 Merge pull request #5867 from Citadel-Station-13/upstream-merge-36290 
[MIRROR] [s] Guards client.holder
 2018-03-09 18:39:35 +00:00
deathride58andGitHub 8728d99ef9 Merge pull request #5866 from Citadel-Station-13/upstream-merge-36287 
[MIRROR] [S] Fixes GLOB protected vars exploit
 2018-03-09 18:39:19 +00:00