shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,716 Commits 5 Branches 0 Tags
2e2ca8eb6dcd436a86e772093b9c96aefcc83bb5
Commit Graph

14716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
2e2ca8eb6d Automatic changelog generation for PR #5899 [ci skip] 2018-03-10 15:35:56 -06:00
deathride58
fc5870f699 Merge pull request #5899 from Citadel-Station-13/upstream-merge-36285 
[MIRROR] Holy water is trivial against Eminence once Daddy arrives
 2018-03-10 21:35:54 +00:00
CitadelStationBot
17500dc2f2 Automatic changelog generation for PR #5896 [ci skip] 2018-03-10 15:35:32 -06:00
deathride58
0d0841eafa Merge pull request #5896 from Citadel-Station-13/upstream-merge-36255 
[MIRROR] Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns
 2018-03-10 21:35:30 +00:00
deathride58
b60b1c7aa8 Merge pull request #5898 from Citadel-Station-13/upstream-merge-36286 
[MIRROR] [s] Fix config loading exploit
 2018-03-10 21:34:34 +00:00
CitadelStationBot
1e0df81e63 Holy water is trivial against Eminence once Daddy arrives 2018-03-10 14:53:30 -06:00
ExcessiveUseOfCobblestone
236effbc5b Holy water is trivial against Eminence once Daddy arrives (#36285) 
* Update _eminence.dm

* cleanup daddio

* Xhuis if I see another spaced if...
 2018-03-10 14:53:30 -06:00
CitadelStationBot
257b03b79f [s] Fix config loading exploit 2018-03-10 14:52:18 -06:00
Jordan Brown
ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -06:00
CitadelStationBot
15af250d21 Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns 2018-03-10 14:37:36 -06:00
Ashe Higgs
ceea41b5fe Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns (#36255) 
* Fixes slowcloning breaking with nonints

* Refactors to use timestamps and not seconds
 2018-03-10 14:37:36 -06:00
CitadelStationBot
aa7b9f192f [MIRROR] harmful var for guns (#5879) 
* harmful var for guns (#36265)

* harmful var for guns

support for pacifism to use non-harmful guns

* fixes bad spacing

oops

* harmful var for guns
 2018-03-10 07:57:57 -06:00
CitadelStationBot
4f4d486244 Automatic changelog generation for PR #5892 [ci skip] 2018-03-10 07:43:44 -06:00
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892) 
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
 2018-03-10 07:43:42 -06:00
CitadelStationBot
0f7171a5b4 Automatic changelog generation for PR #5891 [ci skip] 2018-03-10 07:43:17 -06:00
CitadelStationBot
e1823e1a40 [MIRROR] You can now non-violently place people on tables (#5891) 
* You can now non-violently place people on tables (#36150)

* You can now non-violently place people on tables
 2018-03-10 07:43:14 -06:00
CitadelStationBot
0ebb1be847 Automatic changelog generation for PR #5890 [ci skip] 2018-03-10 07:38:56 -06:00
CitadelStationBot
215ceaead3 [MIRROR] Adds welding goggles to engivend (#5890) 
* Adds welding goggles to engivend (#36280)

* adds pill bottles/rcd/welding goggles

* atmosia is suffering

* Adds welding goggles to engivend
 2018-03-10 07:38:54 -06:00
CitadelStationBot
93d8756a70 [MIRROR] NAMEOFs some things (#5877) 
* NAMEOFs some things (#36263)

* NAMEOFs some things
 2018-03-10 07:38:37 -06:00
CitadelStationBot
67e6c464c3 [MIRROR] Test merge candidate is removed on commit push (#5878) 
* Test merge candidate is removed on commit push (#36266)

* Test merge candidate is removed on commit push
 2018-03-10 07:38:19 -06:00
CitadelStationBot
303ccde640 Automatic changelog generation for PR #5880 [ci skip] 2018-03-10 07:38:00 -06:00
CitadelStationBot
2570cefb40 [MIRROR] Fixes shuttles breaking when the turf the mobile dock is on is removed (#5880) 
* Fixes shuttles breaking when the turf the mobile dock is on is removed (#36261)

* Fixes shuttles breaking when the turf the mobile dock is on is removed
 2018-03-10 07:37:58 -06:00
CitadelStationBot
f4d3cfb0bd Automatic changelog generation for PR #5888 [ci skip] 2018-03-10 07:36:02 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
a999863e5c [MIRROR] Fixes mirror var desync (#5883) 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
 2018-03-10 07:17:52 -06:00
CitadelStationBot
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
CitadelStationBot
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
Poojawa
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
CitadelStationBot
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
Mark9013100
2686699c3e Pillbottles can now be made (#36083) 2018-03-09 14:24:35 -06:00
deathride58
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