shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,868 Commits 5 Branches 0 Tags
4cc0cf3ee7da05a9f7d3b75f7feade7ffd98ca7d
Commit Graph
208 Commits
Author SHA1 Message Date
LetterJayandGitHub 6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
YPOQandCitadelStationBot 796d61a2dc Fixes get_turf_pixel returning null when called on turfs (#32000) 2017-10-23 09:00:35 -05:00
Jordan BrownandCitadelStationBot c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
LetterJayandGitHub 82d02050cd Merge pull request #3547 from Citadel-Station-13/upstream-merge-31989 
[MIRROR] Fixes silicon mob contents becoming contaminated
 2017-10-23 03:35:35 -04:00
orangesandCitadelStationBot bc5c548e9b Merge pull request #31989 from ninjanomnom/radiation-borg-fix 
Fixes silicon mob contents becoming contaminated
 2017-10-21 22:22:01 -05:00
Poojawa 7eb2af06c3 fixes compile 2017-10-21 22:18:19 -05:00
Jordan BrownandCitadelStationBot ff1a3e9f0a Safeguards GetAllContents and makes it throw a warning 2017-10-21 18:56:14 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBotandPoojawa 7f9d13ab42 [MIRROR] Removes 200mb of wasted memory usage (#3472) 
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again

Removes 200mb of wasted memory usage

* Removes 200mb of wasted memory usage
 2017-10-17 22:18:19 -05:00
Jordan BrownandCitadelStationBot fafdf339ff Adds a duplicate stack_trace to /datum (#31783) 2017-10-16 22:56:44 -05:00
LetterJayandGitHub 568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
kevinz000andCitadelStationBot ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
AnturKandCitadelStationBot 64b1be05ff Adds logging crew manifest to seperate file (#31665) 
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
 2017-10-15 16:56:48 -05:00
LetterJayandGitHub 670bd1ef53 Merge pull request #3407 from Citadel-Station-13/upstream-merge-31696 
[MIRROR] Fixes freon colours never going away
 2017-10-15 10:24:12 -04:00
LeoandCitadelStationBot 9c7d2ef609 Merge pull request #31696 from duncathan/atmos-patch6 
Fixes freon colours never going away
 2017-10-15 07:32:53 -05:00
Emmett GainesandCitadelStationBot 24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
Emmett GainesandCitadelStationBot 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan BrownandCitadelStationBot 7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
orangesandCitadelStationBot 472e68be9c Merge pull request #31440 from kevinz000/patch-319 
Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever
 2017-10-10 03:17:33 -05:00
ShizCalevandCitadelStationBot 92ec5c11ab Fixes being able to sell camera mobs to CentCom (#31306) 
* Fixes being able to sell camera mobs to CENTCOM

* Did it Ninja's way.
 2017-10-07 19:13:28 -05:00
LetterJayandGitHub d50c1034b9 Update type2type.dm 2017-10-05 22:44:50 -05:00
Joan LungandCitadelStationBot 2a75083f80 Makes angle2dir() much more accurate 2017-10-05 15:05:13 -05:00
ShizCalevandCitadelStationBot e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 02:48:51 -05:00
AnturKandCitadelStationBot c4dd7ffdbd Fixes paper writing (#31203) 
* Fixes regex typo

* Actually fixes it properly
 2017-10-01 08:41:16 -05:00
LetterJayandGitHub 0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJayandGitHub 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
nicbnandCitadelStationBot 078128aa91 Paper markdown (#30873) 
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
 2017-09-30 08:11:01 -05:00
LetterJayandGitHub b728fd6160 Update global_lists.dm 2017-09-30 01:38:27 -05:00
LetterJayandGitHub 9d40ab978a Update names.dm 2017-09-29 23:38:41 -05:00
LetterJayandGitHub 70d75ffa98 Update global_lists.dm 2017-09-29 23:36:09 -05:00
LetterJayandGitHub 8f6b143161 Merge pull request #2995 from Citadel-Station-13/upstream-merge-31076 
[MIRROR] Fix dangling #elseif in list helpers
 2017-09-29 01:45:25 -04:00
Jordan BrownandCitadelStationBot 116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
orangesandCitadelStationBot 2309a729c7 Merge pull request #31076 from AutomaticFrenzy/elseif 
Fix dangling #elseif in list helpers
 2017-09-28 21:49:42 -05:00
Jordan BrownandCitadelStationBot e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Emmett GainesandCitadelStationBot 16f1ceedd1 GetAllContents performance increase (#31027) 2017-09-28 10:44:28 -05:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
LetterJayandGitHub 68f3b5e719 Update time.dm 2017-09-27 19:10:26 -05:00
LetterJayandGitHub d2149124b7 Update mobs.dm 2017-09-27 15:10:01 -05:00
ShizCalevandCitadelStationBot 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
orangesandCitadelStationBot 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
CitadelStationBotandPoojawa 170f5d7a5e [MIRROR] Log file for PDA messages (#2848) 
* log file for pda messaegs (#30827)

* Log file for PDA messages
 2017-09-19 06:34:53 -05:00
CitadelStationBotandPoojawa 4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBotandPoojawa 08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796) 
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
 2017-09-17 11:59:40 -05:00
CitadelStationBotandPoojawa 119828bb59 [MIRROR] Fixes get_area not working on areas (#2788) 
* Fixes get_area not working on areas

* Fixes get_area not working on areas
 2017-09-15 05:52:39 -05:00
CitadelStationBotandPoojawa 9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739) 
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
 2017-09-13 22:50:01 -05:00
LetterJayandGitHub 1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
Kyle Spier-SwensonandCitadelStationBot 3da71799ab Garbage collection tweaks and refactors. (#30118) 
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
 2017-09-13 01:47:12 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
JJRcopandCitadelStationBot 00dd2f283b Adds Internet admin midi (#30457) 
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
 2017-09-08 09:32:29 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00