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

406 Commits

Author SHA1 Message Date
LetterJay
9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
35a49d5178 Merge pull request #3873 from Citadel-Station-13/upstream-merge-32516 
[MIRROR] removes pipe construction cache
 2017-11-11 12:38:45 -06:00
duncathan salt
3c8eef9243 removes pipe construction cache (#32516) 2017-11-09 11:14:43 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJay
2ec4df456f Merge pull request #3853 from Citadel-Station-13/upstream-merge-32351 
[MIRROR] fixes null parent in destroy for components
 2017-11-08 01:46:47 -06:00
Emmett Gaines
8fb5936c30 fixes null parent in destroy for components (#32351) 
* fixes parent being null in destroy

* extends qdel
 2017-11-07 14:35:46 -06:00
ACCount
0d691189aa Multiple fixes in RPD and pipe construciton (#32399) 
* Multiple fixes in RPD and pipe construciton

* Integrates another fix PR to avoid conflicts
 2017-11-07 14:26:15 -06:00
LetterJay
cf83d3410b Merge pull request #3797 from Citadel-Station-13/upstream-merge-32329 
[MIRROR] Some improvements on the holiday system
 2017-11-04 22:49:49 -05:00
tortellinitony
3772d722e2 Some improvements on the holiday system (#32329) 2017-11-03 23:37:16 -05:00
kevinz000
afca7f1d09 [READY]Helps address atmospherics nullspace runtimes (#32281) 
* Helps fix atmospherics nullspace runtimes, adds debugging to pipe caches and makes the list accessible.

* I can spell properly guys

* Ok ok ok no global!

* Update construction.dm
 2017-11-03 15:54:52 -05:00
LetterJay
4946ce5070 Update radiation.dm 2017-11-03 00:17:25 -05:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
CitadelStationBot
f628779d36 Update radiation.dm 2017-11-02 03:20:33 -05:00
LetterJay
ed2ba5e3f5 Update radiation.dm 2017-11-02 02:21:07 -05:00
oranges
c5e11eceed Some minor contamination fixes 2017-10-31 15:30:53 -05:00
Emmett Gaines
6f940baa0a New ambience for ash storms (#32213) 
song name?
 2017-10-30 15:22:23 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
324da0d915 Merge pull request #3657 from Citadel-Station-13/upstream-merge-32066 
[MIRROR] build_appearance_list no longer edits the list it is passed
 2017-10-29 04:20:56 -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
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
YPOQ
f4d0108beb build_appearance_list no longer edits the list it is passed (#32066) 
* build_appearance_list no longer edits the list it is passed

* Mistakes were made

* Update overlays.dm
 2017-10-27 17:35:13 -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
oranges
c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO 
May as well shave some yaks
 2017-10-26 05:05:09 -05:00
vuonojenmustaturska
1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -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
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
vuonojenmustaturska
360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778) 
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
 2017-10-19 04:57:49 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630 
[MIRROR] Datum rev & related upgrades to base datum antag
 2017-10-18 07:42:54 -04:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Jordan Brown
44ca2d67f6 Merge pull request #31663 from ninjanomnom/shuttle-subsystem 
Repopulates SSshuttle recover
 2017-10-14 18:49:24 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
LetterJay
813e54e5ae Merge pull request #3322 from Citadel-Station-13/upstream-merge-31544 
[MIRROR] Server maint logs when nulls enter the clients list
 2017-10-12 07:19:21 -04:00
LetterJay
3c55163ebd Merge pull request #3319 from Citadel-Station-13/upstream-merge-31464 
[MIRROR] Make SStgui actually read the html from the disk at runtime
 2017-10-12 07:18:42 -04:00
LetterJay
f19437bae9 Merge pull request #3307 from deathride58/crewobjtweaksgalore 
Crew Obj & Miscreant system optimizations and tweaks
 2017-10-12 07:16:13 -04:00
Jordan Brown
acdc5c1380 Server maint logs when nulls enter the clients list (#31544) 2017-10-12 00:29:50 -05:00
Jordan Brown
24a85f97ab Make SStgui actually read the html from the disk at runtime (#31464) 
* Make SStgui actually read the html from the disk at runtime

* Remove the comment

* Back to "
 2017-10-12 00:29:28 -05:00
deathride58
2a46696e55 cleans up comments 2017-10-11 18:26:10 -04:00
deathride58
1a3b0c6528 applies optimizations to miscreants 2017-10-11 18:07:08 -04:00
deathride58
bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
JamieH
9eb83d1598 Fix a bug in the new lobby music system (#31477) 
* Fix a bug in the new lobby music system

* Update ticker.dm

* ...
 2017-10-10 13:14:50 -05:00
vuonojenmustaturska
7cec0bbf67 Adds time dilation data to the feedback table (#31278) 
* adds time dilation data to the feedback table

* Revert "adds time dilation data to the feedback table"

This reverts commit bed0bd78b6e24be7da8269f6af24e51f0c90ded7.

* adds time dilation data to the feedback table 2: electric boogaloo

* Changes
 2017-10-08 15:38:15 -05:00
JamieH
2f41af546e Allows easy hosting of server side lobby music (#31352) 
* Allows easy hosting of server side lobby music

* No images here!!!

* Undelete /tg/ sounds... REEE

* Add back the old system and use it if this doesn't find any music

* Documentation++

* Update round_start_sounds.txt

* Allow for rare map specific title music

Also don't attempt to play non-valid sounds/non-sounds

* Fix bad sound filter, fix common sounds

* Update README.txt

* Update ticker.dm

* Update ticker.dm
 2017-10-08 13:17:01 -05:00
deathride58
5d0853e16a Crew objective/miscreant system tweaks (#3213) 
* Loadsa tweaks

* adds miscreant pref, other fixes

* fixes runtime

* fixes compiling errors for REAL now hopefully

* HOPEFULLY fixes compiling errors

* COMPILE!
 2017-10-08 10:05:40 -07:00
LetterJay
5a65cdc939 Merge branch 'master' into upstream-merge-31309 2017-10-07 01:07:59 -04:00
LetterJay
fe27aa586c Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336 
[MIRROR] Fixes lighting object initialization on new zlevels.
 2017-10-07 01:05:11 -04:00