shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,550 Commits 5 Branches 0 Tags
28f886791d07df44bc2f20a5b2e0142e9e8bde7f
Commit Graph
240 Commits
Author SHA1 Message Date
LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
deathride58andGitHub bc6df43cd0 Merge pull request #4565 from Citadel-Station-13/upstream-merge-33879 
[MIRROR] Removes typepath from random event admin message
 2017-12-29 06:45:22 +00:00
Jordan BrownandCitadelStationBot 067680155f Removes typepath from random event admin message 2017-12-29 00:28:10 -06:00
coiaxandCitadelStationBot dc6b4e2b61 Christmas event changes (#33861) 
* A christmas tree with presents is now a subtype

Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.

Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.

* Code review I

* Gaia's Landing: The PR
 2017-12-29 00:28:02 -06:00
LetterJay 8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
LetterJayandGitHub e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
LetterJayandGitHub 62a9649a98 Update disease_outbreak.dm 2017-12-25 05:23:37 -06:00
LetterJayandGitHub 7b40f3f0e0 Update disease_outbreak.dm 2017-12-25 05:09:21 -06:00
LetterJayandGitHub ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan BrownandCitadelStationBot 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
CitadelStationBotandkevinz000 938f409782 [MIRROR] Christmas (#4491) 
* Christmas (#33690)

* Christmas Event Updates

* Dont recreate the list every time

* Check for drop del

* Changes some things to placate that one guy from FTL

* Christmas
 2017-12-22 13:14:25 -08:00
LetterJayandGitHub 8ea38cfde2 Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681 
[MIRROR] Immovable rod abuse, smite and event trigger.
 2017-12-21 04:55:32 -06:00
AnturKandCitadelStationBot 6c4d687db6 Immovable rod abuse, smite and event trigger. (#33681) 2017-12-21 00:11:20 -06:00
LetterJayandGitHub 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJayandGitHub 9ab75d37b7 Update operative.dm 2017-12-19 19:35:41 -06:00
LetterJayandGitHub bcbb4102bf Update disease_outbreak.dm 2017-12-19 18:50:43 -06:00
LetterJayandGitHub 63b1b1df88 Update disease_outbreak.dm 2017-12-19 18:40:20 -06:00
LetterJayandGitHub 56737f32de Update disease_outbreak.dm 2017-12-19 17:59:55 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJayandGitHub 516db4851f Update disease_outbreak.dm 2017-12-19 16:53:21 -06:00
LetterJayandGitHub 16f1a07b92 diseases 2017-12-19 16:41:09 -06:00
duncathan saltandCitadelStationBot 0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
Emmett GainesandCitadelStationBot 8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -06:00
LetterJayandGitHub fa0bcde791 Update disease_outbreak.dm 2017-12-18 17:24:49 -06:00
XDTMandCitadelStationBot 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJayandGitHub e6aaad1921 Update disease_outbreak.dm 2017-12-17 15:58:06 -06:00
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
RobustinandCitadelStationBot 7d1485643e Fixes race swap (#33566) 2017-12-17 04:11:40 -06:00
LetterJayandGitHub 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
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturKandCitadelStationBot 6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
CruixandCitadelStationBot 746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
YPOQandCitadelStationBot f7d5ab5baf Fixes some broken random events (#33345) 2017-12-08 10:34:50 -06:00
Y0SH1M4S73RandCitadelStationBot 86fca33d06 Cleans up a double assignment (#33048) 
* Fixes component runtimes (#33045)

* fixes an internally redundant assignment statement
 2017-11-24 22:29:53 -06:00
ShizCalevandCitadelStationBot 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58andGitHub 889defd2ce Update _event.dm 2017-11-22 14:29:13 -05:00
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
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 eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00: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
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06: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