shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,417 Commits 5 Branches 0 Tags
7f3987191450969ede029e17593d97da404a1f93
Commit Graph
9148 Commits
Author SHA1 Message Date
LetterJayandGitHub 7f39871914 Merge pull request #5769 from Citadel-Station-13/upstream-merge-36054 
[MIRROR] Fix placement of fancy tables in the editor
 2018-03-03 02:46:14 -06:00
LetterJayandGitHub d4b3ea1a49 Merge pull request #5768 from Citadel-Station-13/upstream-merge-36059 
[MIRROR] Adds rum and coke, corrects Cuba Libre recipe
 2018-03-03 02:45:57 -06:00
LetterJayandGitHub 4162e8a144 Merge pull request #5767 from Citadel-Station-13/upstream-merge-36063 
[MIRROR] Meth is not good for your brain
 2018-03-03 02:45:43 -06:00
LetterJayandGitHub 05b2492f81 Merge pull request #5765 from Citadel-Station-13/upstream-merge-36062 
[MIRROR] White crayons no longer make gloves look latex
 2018-03-03 02:45:13 -06:00
CitadelStationBotandPoojawa c168c1582e [MIRROR] Speed up space wind by avoiding noop proc calls. (#5763) 
* Speed up space wind by avoiding noop proc calls. (#36072)

During times of high numbers of active turfs on station, this proc tends to cost more per turf then process_cell does, avoiding noops is really the only easy speed up opportunity i can see here unless i wanted to make a flag for rather or not experience_pressure_difference is called so only movables that override the default behavior (livings really) get the proc called on them

* Speed up space wind by avoiding noop proc calls.
 2018-03-03 02:32:45 -06:00
Tad HardestyandCitadelStationBot 8fe572acde Merge pull request #36054 from AutomaticFrenzy/patch/fancy-tables-2 
Fix placement of fancy tables in the editor
 2018-03-03 00:31:27 -06:00
JordieandCitadelStationBot 19b24c40a8 Merge pull request #36059 from ShizCalev/cuba_libre 
Adds rum and coke, corrects Cuba Libre recipe
 2018-03-03 00:11:56 -06:00
JordieandCitadelStationBot ddc3d5223c Merge pull request #36063 from Robustin/Methisbadmmmkay 
Meth is not good for your brain
 2018-03-03 00:11:45 -06:00
cebutrisandCitadelStationBot 67bd3b3d7e White crayons no longer make gloves look latex (#36062) 
* makes white crayons make white gloves, not latex

* mime subtype gloves

* Why didn't cobby think of this?

* makes mime crayons give latex gloves
 2018-03-03 00:03:16 -06:00
LetterJayandGitHub 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
deathride58andGitHub 143909a855 Update examine.dm 2018-03-02 21:32:07 -05:00
deathride58andGitHub 272d0e1caf Update preferences_savefile.dm 2018-03-02 21:30:58 -05:00
deathride58andGitHub 616269a8f1 Update preferences_savefile.dm 2018-03-02 21:30:14 -05:00
deathride58andGitHub 797a35e5ad Update preferences_savefile.dm 2018-03-02 21:29:45 -05:00
deathride58andGitHub 0b4cdc2e69 Update preferences.dm 2018-03-02 21:28:33 -05:00
deathride58andGitHub 02b9f290dd Update traits.dm 2018-03-02 21:27:56 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa b198e943e9 [MIRROR] Rearranges cargo packs (#5750) 
* Rearranges cargo packs

* update packs.dm
 2018-03-02 20:06:35 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 7d9dbcd0c3 [MIRROR] [s] Where were you, the day cyberboss exposed the database password to all admins with a holder (#5761) 
* Merge pull request #36104 from MrStonedOne/blamecyberboss

[s] Where were you, the day cyberboss exposed the database password to all admins with a holder

* [s] Where were you, the day cyberboss exposed the database password to all admins with a holder
 2018-03-02 20:03:17 -06:00
CitadelStationBotandPoojawa 42fa773aaf [MIRROR] Fixes backup light rounding (#5759) 
* Fixes backup light rounding - #36060

* Fixes backup light rounding
 2018-03-02 18:42:19 -06:00
CitadelStationBotandPoojawa d4f08c37a7 [MIRROR] When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works. (#5752) 
* Merge pull request #35966 from kevinz000/patch-452

When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works.

* When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works.
 2018-03-02 18:36:39 -06:00
CitadelStationBotandPoojawa 8543df055d [MIRROR] Add parallax sprites from RIS (#5749) 
* Add parallax sprites from RIS (#36049)

* Add files via upload

* Update parallax.dm

* Add parallax sprites from RIS
 2018-03-02 18:35:35 -06:00
CitadelStationBotandPoojawa 190c964234 [MIRROR] C4 logging now shows correct location (#5748) 
* C4 logging now shows correct location (#36047)

* makes c4 log correct location

* C4 logging now shows correct location
 2018-03-02 18:35:21 -06:00
CitadelStationBotandPoojawa 1437fb4bd4 [MIRROR] Fixes SCP-294 overlay problems (#5746) 
* Fixes SCP-294 overlay problems

* recompiles tgui
 2018-03-02 18:34:45 -06:00
CitadelStationBotandPoojawa 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 HiggsandCitadelStationBot 0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
PoojawaandGitHub 3690cf3309 Oops 2018-03-01 09:39:28 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 78708a3582 [MIRROR] Fix icon of black fancy table in editor (#5735) 
* Fix icon of black fancy table in editor

* Fix icon of black fancy table in editor
 2018-02-28 19:41:44 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 9b598e388c [MIRROR] Fixes Cyborg Defib units (#5734) 
* Fixes Cyborg Defib units (#36012)

* Fixes Cyborg Defib units

* Update defib.dm

* Fixes Cyborg Defibs

make it check for a false, not a true

* Fixes Cyborg Defib units
 2018-02-28 19:30:41 -06:00
deathride58andGitHub 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
XDTMandCitadelStationBot 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
vuonojenmustaturskaandCitadelStationBot afb1ab021b Removes SNPCs (#36016) 
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
 2018-02-28 00:12:12 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 4f983ae337 [MIRROR] Crab Rockets (#5719) 
* Crab Rockets

* fixes mirror bot's shit

* ...github wtf
 2018-02-27 05:28:17 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 0ad6fe35e0 [MIRROR] [s] Fixes observers being able to create areas (#5724) 
* [s] Fixes observers being able to create areas (#36006)

* Fixes observers being able to create areas

* Exception for admin ghosts

* [s] Fixes observers being able to create areas
 2018-02-27 05:04:00 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 749f8c4e5c [MIRROR] Revert "Mekhi goes on the table" (#5715) 
* Merge pull request #35980 from kevinz000/revert-35661-patch-483

Revert "Mekhi goes on the table"

* Revert "Mekhi goes on the table"
 2018-02-26 02:38:53 -08:00
PoojawaandGitHub f7f3a600bd Removes Golem access to the station (#5692) 2018-02-26 00:20:37 -06:00
deathride58andGitHub 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
MMMiraclesandCitadelStationBot 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
RobustinandCitadelStationBot 6c8ee4f99e Blood Cult Conversion Fixes (#35930) 
* Cult Fixes

* woops
 2018-02-25 17:30:57 -06:00