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

9157 Commits

Author SHA1 Message Date
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485 
[MIRROR] Antagonist reputation system
 2018-03-04 00:31:41 -06:00
Poojawa
b98fb70da8 Fixes Tesla Coil Circuits and contruction 2018-03-03 22:28:55 -06:00
LetterJay
567bb359ef Merge pull request #5751 from Citadel-Station-13/upstream-merge-35968 
[MIRROR] Makes machines constructable either anchored or unanchored
 2018-03-03 15:06:37 -06:00
LetterJay
4c6dbcc85a Merge pull request #5770 from Citadel-Station-13/upstream-merge-36046 
[MIRROR] Dice icon name and desc change
 2018-03-03 02:46:35 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
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
Slignerd
fa81e27676 d (#36046) 
Dice icon name and desc change
 2018-03-03 00:31:35 -06:00
Tad Hardesty
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
Jordie
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
Jordie
ddc3d5223c Merge pull request #36063 from Robustin/Methisbadmmmkay 
Meth is not good for your brain
 2018-03-03 00:11:45 -06:00
cebutris
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
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
b40310867e Update captain.dm 2018-03-02 21:39:10 -05:00
deathride58
fce0352d56 Update admin.dm 2018-03-02 21:38:20 -05: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
deathride58
02b9f290dd Update traits.dm 2018-03-02 21:27:56 -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
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
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
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
CitadelStationBot
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
CitadelStationBot
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
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
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
BordListian
07270c198f Makes machines constructable either anchored or unanchored (#35968) 
* - Makes machines constructable either anchored or unanchored if the board allows it

* - Tesla Coils connect to the network if anchored
 2018-03-02 14:38:02 -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
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
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
CitadelStationBot
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
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