shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,275 Commits 5 Branches 0 Tags
9f80325c5255fc180e2e100acc2db6a7480b2b18
Commit Graph
150 Commits
Author SHA1 Message Date
deathride58andGitHub d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844 
[MIRROR] Cleans up unused code
 2017-11-21 04:15:11 +00:00
AnturKandCitadelStationBot 70c7996986 Fixes abductor teams getting assigned to same pod (#32859) 
* Fixes abductors getting assigned to same team

* Remove explicit null return
 2017-11-20 19:36:10 -06:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58andGitHub 9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786 
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
 2017-11-18 05:29:32 +00:00
deathride58andGitHub 127846549d Update mass_hallucination.dm 2017-11-17 23:21:13 -05:00
Matt SmithandCitadelStationBot fc90cf5344 Removed unused HTML tags (#32787) 2017-11-16 17:08:51 -06:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJayandGitHub 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJayandGitHub 97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559 
[MIRROR] Makes false alarm use more explicit in event code.
 2017-11-13 11:42:53 -06:00
orangesandCitadelStationBot 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
LetterJayandGitHub 4f5a728415 Update weightless.dm 2017-11-12 08:12:54 -06:00
LetterJayandGitHub c7a25534e4 Update spontaneous_appendicitis.dm 2017-11-12 08:12:43 -06:00
LetterJayandGitHub 65daec8f75 Update prison_break.dm 2017-11-12 08:12:32 -06:00
LetterJayandGitHub a29c317a1d Update mass_hallucination.dm 2017-11-12 08:12:21 -06:00
LetterJayandGitHub eb193ef22b Update ion_storm.dm 2017-11-12 08:12:11 -06:00
LetterJayandGitHub e8e18ebc5f Update friday13th.dm 2017-11-12 08:11:50 -06:00
LetterJayandGitHub 3ae0051dc7 Update dust.dm 2017-11-12 08:11:41 -06:00
LetterJayandGitHub 475e604892 Update communications_blackout.dm 2017-11-12 08:11:28 -06:00
LetterJayandGitHub a5a7b92897 Update anomaly_vortex.dm 2017-11-12 08:11:14 -06:00
LetterJayandGitHub c311b6c87e Update anomaly_grav.dm 2017-11-12 08:11:06 -06:00
LetterJayandGitHub 3b6e596a45 Update anomaly_flux.dm 2017-11-12 08:10:56 -06:00
LetterJayandGitHub 1be11114c5 Update anomaly_bluespace.dm 2017-11-12 08:10:48 -06:00
LetterJayandGitHub fdb3324a4b Update anomaly.dm 2017-11-12 08:10:37 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
AnturKandCitadelStationBot f6e07cf824 Makes false alarm use more explicit in event code. 2017-11-11 14:36:36 -06:00
orangesandCitadelStationBot 0513ce290e Merge pull request #32428 from kevinz000/patch-374 
Fixes spacevines causing negative pressure/temperature
 2017-11-07 14:36:56 -06:00
Jordan BrownandCitadelStationBot ba1d3fd2c2 Merge pull request #32150 from MrStonedOne/patch-442 
Meteor gating tweaks
 2017-10-30 14:51:44 -05:00
LetterJayandGitHub b0573cc67f Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144 
[MIRROR] Adds new valentines; replaces outdated/shitty ones.
 2017-10-29 23:38:55 -04:00
bgobanditandCitadelStationBot adf7bdccbd Adds new valentines; replaces outdated/shitty ones. (#32144) 
* adds valentines, cuts old references

* Adds valentines, replaces outdated ones

* more entendre-y
 2017-10-29 11:04:04 -05:00
Kyle Spier-SwensonandCitadelStationBot 8d234df96f Events take pre-game lobby time into account (#32154) 
* Events take pre-game lobby time into account

* Friends don't let friends code without coffee.

It would appear that  I have no friends

* i blame cyberboss
 2017-10-29 10:36:56 -05:00
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJayandGitHub 39f683ab8d Update meteor_wave.dm 2017-10-27 15:32:38 -05:00
LetterJayandGitHub 12d336cbf0 Update halloween.dm 2017-10-27 15:32:15 -05:00
KorPhaeronandCitadelStationBot 00163837de Halloween Tweaks 2017-10-26 05:20:53 -05:00
LetterJayandGitHub 58ef2f1872 Merge pull request #3551 from Citadel-Station-13/upstream-merge-31922 
[MIRROR] Adds admin override for false alarm event.
 2017-10-23 03:44:25 -04:00
LetterJayandGitHub 5d20c88a5c Update false_alarm.dm 2017-10-22 10:55:42 -05:00
LetterJayandGitHub 03690f9d67 Update blob.dm 2017-10-22 10:51:21 -05:00
Jordan BrownandCitadelStationBot faf0e0a10a Adds admin override for false alarm event. 2017-10-22 00:05:23 -05:00
KorPhaeronandCitadelStationBot c42e1b17f4 Blob fixes 2017-10-21 14:08:10 -05:00
CitadelStationBotandPoojawa e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436) 
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
 2017-10-21 07:10:23 -05:00
LetterJayandGitHub f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
duncathan saltandCitadelStationBot c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
AnturKandCitadelStationBot 5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
MoreRobustThanYouandCitadelStationBot b05a4ebb29 Makes the santa event properly poll ghosts (#31437) 
* Makes the santa event properly poll ghosts

* Update xmas.dm

* Update xmas.dm

* Create event.dm

* Update tgstation.dme

* Update xmas.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm
 2017-10-10 03:16:23 -05:00
KorPhaeronandCitadelStationBot e7800a2235 Uses the proper list for xeno landmarks/nightmare spawning (#31470) 2017-10-09 16:00:24 -05:00
KorPhaeronandCitadelStationBot 39728cc9b3 Nightmare spawn event (#31376) 
* Nightmare Event

* Update nightmare.dm

* Standards
 2017-10-07 08:41:25 -05:00
kevinz000andCitadelStationBot 3b3b45c03c Fixes/tweaks wormholes event and portals (#30846) 
* fix

* THERE WE GO

* Update portals.dm
 2017-10-03 04:37:35 -05:00
KorPhaeronandCitadelStationBot 3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJayandGitHub cc8f494f1f Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129 
[MIRROR] Cleans up some antag/event landmark checks
 2017-10-01 23:36:48 -04:00
LetterJayandGitHub 676abb946c Update halloween.dm 2017-10-01 15:26:56 -05:00