shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
e292b050f8a413c3f643b20664f2ea3dcf6f4e21
Commit Graph

106 Commits

Author SHA1 Message Date
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633) 
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
 2018-01-21 13:34:04 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
WJohn
16596405e1 Remakes the space syndicate listening post. (#34309) 
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
 2018-01-15 07:18:15 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Cruix
ab408d3e97 Made atoms not smooth with shuttles (#33807) 
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
 2017-12-29 00:29:04 -06:00
Emmett Gaines
a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
oranges
d619f206c6 Merge pull request #33235 from Fox-McCloud/xenobio-console 
Slime Blueprint Change
 2017-12-08 10:34:13 -06:00
deathride58
c43dc3ab7a Update Space_Station_13_areas.dm 2017-11-24 17:39:59 -05:00
Leo
521277292d Revises the_station_areas list 2017-11-24 14:12:53 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
d8e1562fcf Merge pull request #3995 from deathride58/manualsyncsreeEEEE 
Manual map syncs + manual mirrors of missed upstream map PRs
 2017-11-20 05:12:06 +00:00
deathride58
fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
46ba6cbc7b Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620 
[MIRROR] Greatly increases the performance of station-ending plasma fires
 2017-11-15 10:40:40 -06:00
LetterJay
16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
vuonojenmustaturska
157998e974 Greatly increases the performance of station-ending plasma fires 2017-11-14 13:51:45 -06:00
LetterJay
36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623 
[MIRROR] Adds ambience for Reebe.
 2017-11-13 11:53:21 -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
Qustinnus
182b81a721 Adds ambience for Reebe. (#32623) 
* spooky

* fix 1

* fix 2
 2017-11-13 03:45:03 -06:00
Emmett Gaines
3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -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
LetterJay
7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay
b0439afd08 Update ai_monitored.dm 2017-11-09 03:17:59 -06:00
kevinz000
b44e31951d Weakrefs 2017-11-09 00:49:01 -06:00
Emmett Gaines
f1cbf4e0a3 fixes power_change being called on un-initialized machines (#32503) 2017-11-08 19:51:48 -06:00
Qustinnus
d475149e8d Adds around 30 new ambience sounds, and changes ambience code a little bit 2017-11-03 15:53:09 -05:00
Emmett Gaines
6f940baa0a New ambience for ash storms (#32213) 
song name?
 2017-10-30 15:22:23 -05:00
Ashe Higgs
37bb75a645 Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723) 
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
 2017-10-27 17:36:31 -05:00
ShizCalev
dbba59e0b5 Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:41 -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
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709) 
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
 2017-10-15 11:31:48 -05:00
LetterJay
253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570 
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
 2017-10-14 15:37:17 -04:00
LetterJay
66585f242c Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512 
[MIRROR] Refactors away mission & space ruin area code.
 2017-10-13 23:36:01 -04:00
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
Ashe Higgs
f9436e53c4 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565) 
* Clockwork power generator tweaks

* Includes a blob_allowed check
 2017-10-12 18:32:37 -05:00
ShizCalev
74c9b75ba1 Refactors away mission & space ruin area code. 2017-10-12 12:46:52 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
oranges
645d8fdc7c Merge pull request #31315 from tgstation/Cyberboss-patch-3 
Removes shitty sleep from area/Entered
 2017-10-05 17:43:23 -05:00
ShizCalev
d98cd745dd Fixes morgue maintenance radstorm protection (#31253) 
* Morgue maint area

* Fixed typo
 2017-10-03 17:11:57 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
CitadelStationBot
3b144c423c [MIRROR] Fix CentCom issues (#2619) 
* Fix CentCom issues

* Actually ports fixes
 2017-09-13 20:43:11 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00