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

5326 Commits

Author SHA1 Message Date
Jordie
ddc3d5223c Merge pull request #36063 from Robustin/Methisbadmmmkay 
Meth is not good for your brain
 2018-03-03 00:11:45 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
deathride58
143909a855 Update examine.dm 2018-03-02 21:32:07 -05:00
deathride58
272d0e1caf Update preferences_savefile.dm 2018-03-02 21:30:58 -05:00
deathride58
616269a8f1 Update preferences_savefile.dm 2018-03-02 21:30:14 -05:00
deathride58
797a35e5ad Update preferences_savefile.dm 2018-03-02 21:29:45 -05:00
deathride58
0b4cdc2e69 Update preferences.dm 2018-03-02 21:28:33 -05:00
CitadelStationBot
fdd6b01354 [MIRROR] Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#5757) 
* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK) (#35853)

* Update all_nodes.dm

* Lowers lasers to 3K from 5K

* 10K -> 7.5K

* Increase Cost of Stockpart-related Tech (MULTIPLICATIVE GAINS OK)
 2018-03-02 20:08:04 -06:00
CitadelStationBot
75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758) 
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
 2018-03-02 20:07:39 -06:00
CitadelStationBot
b198e943e9 [MIRROR] Rearranges cargo packs (#5750) 
* Rearranges cargo packs

* update packs.dm
 2018-03-02 20:06:35 -06:00
CitadelStationBot
59d61d5e0d [MIRROR] [READY]Circuit balance (#5760) 
* [READY]Circuit balance

* [READY]Circuit balance (#35931)

* cooldowns, power cell,disks

* NUMBERS NUMBERS NUMBERS

* 1 8 9

* PR PR PR

* DESC DESCDSCDCC

* <br>

* GET ALL CONTENTS

* Update power.dm

* Update power.dm

* Update time.dm
 2018-03-02 20:05:28 -06:00
CitadelStationBot
42fa773aaf [MIRROR] Fixes backup light rounding (#5759) 
* Fixes backup light rounding - #36060

* Fixes backup light rounding
 2018-03-02 18:42:19 -06:00
CitadelStationBot
1437fb4bd4 [MIRROR] Fixes SCP-294 overlay problems (#5746) 
* Fixes SCP-294 overlay problems

* recompiles tgui
 2018-03-02 18:34:45 -06:00
CitadelStationBot
17b48041a7 [MIRROR] Fixes NTNet scanner component (#5743) 
* Fixes NTNet scanner component (#36036)

* Fixes NTNet scanner component
 2018-03-02 18:32:47 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
Poojawa
3690cf3309 Oops 2018-03-01 09:39:28 -06:00
CitadelStationBot
bbc261952e [MIRROR] Medals now show the commendation text in the description. (#5733) 
* Medals now show the commendation text in the description. (#36020)

* Medals now show the commendation text in the description

* the user is now real

* Medals now show the commendation text in the description.
 2018-02-28 19:42:03 -06:00
CitadelStationBot
b40980b0c1 [MIRROR] Fixes hidden node unlocking (#5731) 
* Merge pull request #36013 from kevinz000/techwebs_hotfix_1

Fixes hidden node unlocking

* Fixes hidden node unlocking
 2018-02-28 19:31:38 -06:00
deathride58
641187a4b1 Merge pull request #5730 from Citadel-Station-13/upstream-merge-35911 
[MIRROR] Bath Salts now induce psychotic rage, but cause much more brain damage
 2018-02-28 15:50:05 +00:00
XDTM
8c1e1aa3ef Bath Salts now induce psychotic rage, but cause much more brain damage (#35911) 
* Bath Salts now induce psychotic rage, but cause much more brain damage

* goodcode
 2018-02-28 03:21:55 -06:00
vuonojenmustaturska
afb1ab021b Removes SNPCs (#36016) 
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
 2018-02-28 00:12:12 -06:00
CitadelStationBot
a53e395606 [MIRROR] Tesla Corona Analyzers (#5726) 
* Tesla Corona Analyzers (#35965)

* Tesla Corona Analyzers

Generate points to make up for no bomb production on maps like Pubby

* Silly me, not Aurora, but Corona

* Adds sprites to the new mode

* new sprites! credit to... me!

* Further sprite tweaks.

* Tesla Corona Analyzers
 2018-02-27 07:41:38 -06:00
CitadelStationBot
4f983ae337 [MIRROR] Crab Rockets (#5719) 
* Crab Rockets

* fixes mirror bot's shit

* ...github wtf
 2018-02-27 05:28:17 -06:00
CitadelStationBot
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701) 
* Operating computers now display required surgery chems

* Rebuilds tgui
 2018-02-27 05:05:02 -06:00
CitadelStationBot
5f6c41fa30 [MIRROR] Ports more operations to "tool_act" (#5718) 
* Merge pull request #35854 from ACCount12/more_tool_act

Ports more operations to "tool_act"

* Ports more operations to "tool_act"
 2018-02-27 05:04:27 -06:00
CitadelStationBot
4fed776e7e [MIRROR] Heart Attack Event Actually Works Now (#5717) 
* Merge pull request #35928 from Robustin/brokenhearts

Heart Attack Event Actually Works Now

* Heart Attack Event Actually Works Now
 2018-02-27 05:04:12 -06:00
CitadelStationBot
ff918707ee [MIRROR] Cleanbot fix (#5720) 
* Cleanbot fix (#36003)

cl selea
fix: fixed floorbot
fix: fixed cleanbot
refactor: improved pathiding in case of given minimal distance;improved sanitation
/cl
closes #35995, #35919

* Cleanbot fix
 2018-02-27 05:03:42 -06:00
CitadelStationBot
f7ade14cf7 [MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723) 
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
 2018-02-27 05:03:07 -06:00
CitadelStationBot
b7d616250d [MIRROR] Fixes hitscans, and this time, properly (#5716) 
* Merge pull request #35923 from kevinz000/i_betrayed_naksu

Fixes hitscans, and this time, properly

* Fixes hitscans, and this time, properly
 2018-02-26 15:59:26 -08:00
deathride58
509148f7f3 Merge pull request #5713 from Citadel-Station-13/upstream-merge-35930 
[MIRROR] Blood Cult Conversion Fixes
 2018-02-26 00:28:29 +00:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665) 
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
 2018-02-25 18:11:48 -06:00
Robustin
6c8ee4f99e Blood Cult Conversion Fixes (#35930) 
* Cult Fixes

* woops
 2018-02-25 17:30:57 -06:00
LetterJay
fb705d7849 Merge pull request #5711 from Citadel-Station-13/upstream-merge-35960 
[MIRROR] Oh, uhh, that isn't smoke! It's steam. Hamburgers have a 1% chance to spawn as steamed hams.
 2018-02-25 16:59:56 -06:00
LetterJay
d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639 
[MIRROR] Refactors anti-magic into a component
 2018-02-25 16:59:38 -06:00
Xhuis
919d7e2013 Steamed hams. 2018-02-25 16:38:39 -06:00
deathride58
621090d54d Merge pull request #5707 from Citadel-Station-13/upstream-merge-35840 
[MIRROR] Removes liver unfailure and makes alcohol do the killing thing sometimes
 2018-02-25 21:42:21 +00:00
deathride58
e721dfdc7c Merge pull request #5706 from Citadel-Station-13/upstream-merge-35754 
[MIRROR] Fixes a runtime in "reference decoder" circuit
 2018-02-25 21:41:54 +00:00
deathride58
44d8fd6085 Merge pull request #5705 from Citadel-Station-13/upstream-merge-35744 
[MIRROR] Refactors butchering to a component - item-based butchering effectiveness, speed, and chances
 2018-02-25 21:41:38 +00:00
deathride58
b0ca7f2aaa Merge pull request #5704 from Citadel-Station-13/upstream-merge-35667 
[MIRROR] [s] Fixes tritium rad_pulse overload
 2018-02-25 21:40:41 +00:00
deathride58
478c99b743 Merge pull request #5703 from Citadel-Station-13/upstream-merge-35657 
[MIRROR] Circuit cloning balance: Timed cloning, reduced upgrade disk material cost
 2018-02-25 21:40:25 +00:00
deathride58
a8e458188a Update inflict_handler.dm 2018-02-25 16:39:35 -05:00
deathride58
bee0f1a366 Update emplosion.dm 2018-02-25 16:39:16 -05:00
deathride58
86f30eaa6f Merge pull request #5699 from Citadel-Station-13/upstream-merge-35945 
[MIRROR] Removes definition redundancy
 2018-02-25 21:37:47 +00:00
deathride58
41fa7b67c7 Merge pull request #5698 from Citadel-Station-13/upstream-merge-35938 
[MIRROR] Adds limitations to brain traumas
 2018-02-25 21:34:45 +00:00
BordListian
a75ac3bc13 Removes liver unfailure and makes alcohol do the killing thing sometimes (#35840) 
* - Removes liver unfailure

* - MY LIVER FAILED INSTANTLY

* - Increases liver damage tenfold because whats the point of this pr if you need to drink 100 liters of the toughest booze in the game before you get liver damage

* - Fixes cyber livers not being twice as durable as ordinary livers
- Ok compromise alcohol does twice as much liver damage
- Fixes livers regenerating after they failed

* - I'll be happy if bacchus blessing destroys my liver and absinthe doesn't

* - I think this is the final number I'll punch in. I downed 14 shot glasses of vodka
 2018-02-25 14:52:53 -06:00
ACCount
7c5e9f968f Fixes a runtime in "reference decoder" circuit (#35754) 
* Adds "safe" option to hextostr and hex2num

* Fixes a runtime in ICs
 2018-02-25 14:51:41 -06:00
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744) 
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
 2018-02-25 14:50:29 -06:00
Buggy123
924463b7a5 [s] Fixes tritium rad_pulse overload (#35667) 
* Crashing the server is bad, mkay?

* BYOND PLEASE THIS IS KINDA IMPORTANT
 2018-02-25 14:49:18 -06:00
Ashe Higgs
063fc1a7af Circuit cloning balance: Timed cloning, reduced upgrade disk material cost (#35657) 
* Printing compromise

* Adds fast cloning to the upgraded printer

* sorry this took so long
 2018-02-25 14:47:06 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00