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

114 Commits

Author SHA1 Message Date
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament 
Correct spelling of armament
 2018-01-26 03:01:01 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
Leo
e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message 
Removed named args from visible_message
 2018-01-24 11:59:50 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
MoreRobustThanYou
c889a965df Fixes each monkey having it's own individual monkey_team (#34709) 
* Fixes monkey teams

* Update monkey.dm
 2018-01-21 21:15:09 -06:00
deathride58
83135ca4e0 Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567 
[MIRROR] Fixes Revs & Clockcultists being valid for mindswap
 2018-01-21 22:39:53 +00:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
Jordan Brown
a7c9593aa6 Merge pull request #34695 from AnturK/brotherobjectivefix 
Fixes brother objectives not showing in TP
 2018-01-21 09:16:05 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Jordan Brown
29a3a196b4 Merge pull request #34409 from MoreRobustThanYou/patch-45 
Fixes monkeymode shit
 2018-01-14 22:02:47 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
LetterJay
f36b07371f Update datum_traitor.dm 2018-01-06 10:23:08 -06:00
AnturK
0638dabfd2 Fixes some antags missing from roundend report 2018-01-06 08:51:51 -06:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
LetterJay
dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
7d4a51f659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463 2018-01-01 04:36:29 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
MoreRobustThanYou
459d4f35c7 Monkeymode fixes (#33796) 
* Monkey fixes

* Update say.dm
 2017-12-29 10:08:17 -06:00
LetterJay
c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
LetterJay
0381491643 oops 2017-12-27 07:08:26 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJay
290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
MoreRobustThanYou
2f8d49de91 [READY] Monkey mode overhaul 2017-12-15 18:35:52 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
AnturK
7c0b21012f Adds blob roundend report. (#33463) 
* Adds blob roundend report. (Also adminabuse)

* Old comment

* Grammer

* Moves antag to seperate file
 2017-12-14 01:39:36 -06:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
YPOQ
f7d5ab5baf Fixes some broken random events (#33345) 2017-12-08 10:34:50 -06:00
AnturK
47ffd28850 Fixes robeless apprentice 2017-12-05 03:23:54 -06:00
ExcessiveUseOfCobblestone
ae5221371f Revolutionaries can now see deconversion message regardless of status (#33202) 2017-12-02 17:47:30 -06:00
MoreRobustThanYou
8f23eeb003 Fix #32755 (#33073) 2017-11-25 15:17:42 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
LetterJay
ce0ce0b6b9 Update changeling.dm 2017-11-15 10:38:57 -06:00
LetterJay
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
oranges
51b0c286a9 Fixes readapt removing hivemind communication. 2017-11-13 03:20:50 -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
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
oranges
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
AnturK
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
MoreRobustThanYou
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
CitadelStationBot
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