shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,876 Commits 5 Branches 0 Tags
19abbdfd5f64c849888cb5616f07f67a4ed64ebc
Commit Graph

237 Commits

Author SHA1 Message Date
LetterJay
bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481 
[MIRROR] [READY]integrated circuitry port+upgrade.
 2017-11-14 15:51:03 -06:00
LetterJay
c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371 
[MIRROR] SSoverlay improvements and tweaks
 2017-11-14 14:56:34 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJay
32bfa75c3a Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558 
[MIRROR] Prevent placing posters on diagonal wall corners
 2017-11-13 11:50:36 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
Tad Hardesty
96b30fa61e Prevent placing posters on diagonally-smoothed walls (#32558) 
Posters are also knocked off the walls if they change to being
diagonally smoothed later.
 2017-11-13 02:33:30 -06:00
LetterJay
7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
3bd0fda1ba Update unsorted.dm 2017-11-11 15:53:07 -06:00
Kyle Spier-Swenson
2d8fc6de61 SSoverlay improvements and tweaks (#32371) 
* Overlay per-type cost logging.

Overlays will now log how long each type took to process.

Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)

Made the overlay loop faster by making it not cut the list until the end.

Added a simple generic benchmark stat tracking system.

I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.

* Removes flush() as it was creating race conditions

* Use ref

* text2file

* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
 2017-11-10 13:26:23 -06:00
Incoming5643
fea3709963 Doubles the length of Twitterize's accepted string length (#32552) 
twitter made a bad decision and I intend to capitalize on it
 2017-11-09 19:48:00 -06:00
LetterJay
2230c79af3 Update unsorted.dm 2017-11-09 03:17:35 -06:00
kevinz000
b44e31951d Weakrefs 2017-11-09 00:49:01 -06:00
deathride58
3f9e54703a fixes character preview icon directions in ONE LINE (#32332) 2017-11-02 20:24:03 -05:00
CitadelStationBot
b93d28d9aa Merge pull request #3736 from Citadel-Station-13/upstream-merge-32252 
[MIRROR] Reflector fixes and improvements
 2017-11-02 04:07:01 -05:00
ACCount
cfaa6a9cd5 Reflector fixes and improvements 2017-10-31 21:01:45 -05:00
kevinz000
8a7f8c9bc6 Fixes admin buildmode stripping people naked yet again, adds GetAllContentsIgnoring (#31769) 
* Add GetAllContentsIgnoring which accepts an ignore typecache to ignore

* Update turf.dm

* fixes

* Update unsorted.dm

* Update turf.dm
 2017-10-31 09:09:02 -05:00
LetterJay
31e2303e39 Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849 
[MIRROR] Comms console tweak
 2017-10-31 07:58:15 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
6156067cd6 Merge pull request #3645 from Citadel-Station-13/upstream-merge-32022 
[MIRROR] Find references fix.
 2017-10-29 03:45:15 -04:00
LetterJay
7ffe1b4e23 Update cmp.dm 2017-10-27 23:55:23 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
Kyle Spier-Swenson
8469b4223e Find references fix. (#32022) 
* Find references fix.

Made it go from taking years to hours

Removed Datum based recursion, this was unneeded.

Fixed it calling a proc for what ended up being a costly noop millions of times (this was a moderate speed up as it would call DoSearchVar on every fucking number or string or null in a things vars list.)

Fixed it calling itself on the vars list. luckily it only checked keys, so this didn't stack overflow.

I'm intentionally leaving the debugging stuff in right now so that its on the record somewhere. I'll remove that when I pr line by line profiling as its own separate thing

* Remove debugging stuff

* i forgot
 2017-10-27 04:57:15 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
Remie Richards
649fe581fd Actual performance improvements for GetAllContents (#32029) 
* Actual performance improvements for GetAllContents

* Shaving off literal tens of clock cycles
 2017-10-26 05:02:36 -05:00
LetterJay
a027526ba4 Merge branch 'master' into upstream-merge-31849 2017-10-25 16:55:39 -04:00
LetterJay
6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
YPOQ
796d61a2dc Fixes get_turf_pixel returning null when called on turfs (#32000) 2017-10-23 09:00:35 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
LetterJay
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
oranges
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 Brown
ff1a3e9f0a Safeguards GetAllContents and makes it throw a warning 2017-10-21 18:56:14 -05:00
CitadelStationBot
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
oranges
b439b96865 Comms console tweak 2017-10-19 03:52:52 -05:00
CitadelStationBot
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 Brown
fafdf339ff Adds a duplicate stack_trace to /datum (#31783) 2017-10-16 22:56:44 -05:00
LetterJay
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
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
AnturK
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
LetterJay
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
Leo
9c7d2ef609 Merge pull request #31696 from duncathan/atmos-patch6 
Fixes freon colours never going away
 2017-10-15 07:32:53 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown
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
oranges
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
ShizCalev
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
LetterJay
d50c1034b9 Update type2type.dm 2017-10-05 22:44:50 -05:00