cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-28 18:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,055 Commits 55 Branches 0 Tags
be9ae841b6eb4379542f3c0f8440e5baf7b4b51c
Commit Graph

9510 Commits

Author SHA1 Message Date
Poojawa
51200f4739 reee 2018-03-11 04:52:07 -05:00
CitadelStationBot
18ace46af8 [MIRROR] Improves the shuttle error to include jump links and destination (#5900) 
* Improves the shuttle error to include jump links and destination (#36305)

* Improves the shuttle error to include jump links and destination
 2018-03-10 23:09:15 -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
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
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
Jordan Brown
ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
deathride58
f10552f7ef Update ntnet_interface.dm 2018-03-09 13:37:55 -05: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
ba5b5b433e Merge pull request #36289 from tgstation/Cyberboss-patch-4 
[s] Stop qdeling shit you're not supposed to
 2018-03-09 10:44:46 -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