shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,743 Commits 5 Branches 0 Tags
cad36fb29d4c08b079dd83d629dc0e409d22aa8b
Commit Graph
78 Commits
Author SHA1 Message Date
ExcessiveUseOfCobblestoneandCitadelStationBot ae5221371f Revolutionaries can now see deconversion message regardless of status (#33202) 2017-12-02 17:47:30 -06:00
MoreRobustThanYouandCitadelStationBot 8f23eeb003 Fix #32755 (#33073) 2017-11-25 15:17:42 -06:00
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
LetterJayandGitHub ce0ce0b6b9 Update changeling.dm 2017-11-15 10:38:57 -06:00
LetterJayandGitHub 5591672deb Merge pull request #3915 from Citadel-Station-13/upstream-merge-32618 
[MIRROR] Fixes readapt removing hivemind communication.
 2017-11-13 11:52:48 -06:00
orangesandCitadelStationBot 51b0c286a9 Fixes readapt removing hivemind communication. 2017-11-13 03:20:50 -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
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
orangesandCitadelStationBot 730c13f980 Merge pull request #32091 from tgstation/Cyberboss-patch-1 
Revheads now always recieve a HUD when created
 2017-10-27 17:44:06 -05:00
AnturKandCitadelStationBot 0faee43f95 Cleans up datum traitor minimally. (#31978) 
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
 2017-10-22 17:44:55 -05:00
MoreRobustThanYouandCitadelStationBot 637273285d Blood Brother now properly sets special role (#31964) 
* Blood Brother now properly sets special role

* Update mob_helpers.dm

* Update mob_helpers.dm

* Update mob_helpers.dm
 2017-10-21 20:15:49 -05:00
CitadelStationBotandPoojawa 0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
CitadelStationBotandPoojawa c0e00ab5ca [MIRROR] [s] Fixes datum antag is_banned (#3523) 
* Fixes datum antag jobbans (#31901)

* [s] Fixes datum antag is_banned
 2017-10-20 12:48:15 -05:00
AnturKandCitadelStationBot 2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
AnturKandCitadelStationBot c85e760eac Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
AnturKandCitadelStationBot 5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
LeoandCitadelStationBot 5a0d1e5aeb Merge pull request #31294 from YPOQ/sciencetoolfix 
Fix abductor scientist being unable to use science tool
 2017-10-05 06:49:54 -05:00
LetterJayandGitHub f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJayandGitHub b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722 
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
 2017-10-01 02:51:56 -04:00
LetterJayandGitHub 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
vuonojenmustaturskaandCitadelStationBot 98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
LetterJayandGitHub 7b3f91131b Update datum_traitor.dm 2017-09-29 23:45:07 -05:00
LetterJayandGitHub e4e741d924 Merge pull request #2997 from Citadel-Station-13/upstream-merge-31074 
[MIRROR] Ninja outfit code cleanup
 2017-09-29 01:45:54 -04:00
orangesandCitadelStationBot a01540e39b Merge pull request #31074 from pubby/ninjaoutfit 
Ninja outfit code cleanup
 2017-09-28 21:53:05 -05:00
pubbyandCitadelStationBot 3c769e323e Remove unused ninja team var 2017-09-28 21:45:02 -05:00
kevinz000andCitadelStationBot df16529ed3 Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas. (#30722) 
* initial commit

* bugfix

* Update changeling.dm

* Update datum_traitor.dm

* Update datum_traitor.dm

* Update objective.dm

* compile
 2017-09-28 21:44:42 -05:00
Jordan BrownandCitadelStationBot e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJayandGitHub 18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
pubbyandCitadelStationBot 34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
pubbyandCitadelStationBot 382d549c2f Allow AIs to greentext survive (#30959) 
* Change AI objectives from survive to exist

* Cyberboss simplification
 2017-09-24 17:38:00 -05:00
pubbyandCitadelStationBot a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kingofkosmosandCitadelStationBot 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
LetterJay a6aa71e0b9 commit 2017-09-01 09:52:29 -05:00
CitadelStationBot e9180afe0a Small devil fixes. 2017-08-26 11:07:16 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBotandkevinz000 8267e1ad25 Fixes missing objectives and antag status. (#2244) 2017-08-04 08:42:55 -07:00
LetterJayandGitHub 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
ktccdandkevinz000 c52f7a0475 Delayed objective (#2140) 
Delayed objective [Latejoiners can now be selected as traitor targets]
 2017-07-27 05:27:58 -07:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBotandkevinz000 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot 5cf2065432 Ninja Dash 2017-06-26 08:57:46 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00