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

5438 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
6d91d7d438 fixes bad mirror 2018-03-09 15:58:25 -05: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
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
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
deathride58
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
deathride58
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
deathride58
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
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
vuonojenmustaturska
f8d783ae70 Disables advanced shuttle navigation consoles during nuclear war ops 2018-03-09 12:49:44 -06:00
Jordan Brown
7650336507 Merge pull request #36258 from vuonojenmustaturska/bepis 
Makes the smoke machine deconstructable
 2018-03-09 12:48:31 -06:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858 
[MIRROR] Mushroom people, revived!
 2018-03-09 18:37:29 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
vuonojenmustaturska
1995f00032 Merge pull request #36252 from kevinz000/patch-463 
Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
 2018-03-09 11:04:28 -06:00
vuonojenmustaturska
bf63e9ad3f Merge pull request #36288 from Cyberboss/BansKevinzFinally 
You can no longer SDQL select certain datums
 2018-03-09 10:45:58 -06:00
vuonojenmustaturska
f25ed2503e Merge pull request #36290 from tgstation/Cyberboss-patch-5 
[s] Guards client.holder
 2018-03-09 10:28:17 -06:00
LetterJay
ad0be11cbc Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073 
[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
 2018-03-09 04:53:41 -06:00
LetterJay
2f2aed48e4 Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051 
[MIRROR] The ARM is now harder to obtain
 2018-03-09 04:53:23 -06:00
LetterJay
0e2531faaf Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106 
[MIRROR] To go even further byond... the above lighting layer!
 2018-03-09 04:52:32 -06:00
LetterJay
c86aeef909 Merge pull request #5860 from Citadel-Station-13/upstream-merge-36195 
[MIRROR] Minor say code cleanup
 2018-03-09 04:52:18 -06:00
kevinz000
0905f68bbc Projectiles delete on invalid turf (#36073) 2018-03-09 02:26:05 -06:00
Robustin
e9d3af6e61 The ARM is now harder to obtain (#36051) 
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
 2018-03-09 02:17:46 -06:00
astralloop
e8548b392b To go even further byond... the above lighting layer! (#36106) 
* This, is my normal form.

* THIS, IS A SUPER SAIYAN ASCENDED.

I CALL IT A SUPER SAIYAN 2

* Update lighting.dm

* Spelling correction (#3)

* Update layers.dm

* Update chunk.dm

* TO GO BYOND....

* Update lighting.dm
 2018-03-08 22:43:23 -06:00
vuonojenmustaturska
8c87527005 Minor say code cleanup 2018-03-08 22:43:15 -06:00
vuonojenmustaturska
423302ac3c Merge pull request #36217 from Cruix/disease_freemove 
Sentient diseases get 2 minutes to select their initial host
 2018-03-08 22:42:57 -06:00
ACCount
f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
deathride58
a80ab73951 Update net_snare.dm 2018-03-08 01:09:05 -05:00
deathride58
0f0ab49648 Update species.dm 2018-03-08 01:03:56 -05:00
deathride58
56845788ac Merge pull request #5817 from Zna12/Filet-o-fish 
Filet-O-Sharkpeople
 2018-03-08 05:59:01 +00:00
deathride58
1850af961d Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198 
[MIRROR] Disease fixes
 2018-03-08 05:58:11 +00:00
deathride58
f836affa2e Merge pull request #5842 from Citadel-Station-13/upstream-merge-36191 
[MIRROR] Allow configuring ruin/empty space level count
 2018-03-08 05:57:03 +00:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
vuonojenmustaturska
5cfc5f3730 Merge pull request #36198 from Cruix/disease_fixes 
Disease fixes
 2018-03-07 16:04:14 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00