shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,296 Commits 5 Branches 0 Tags
aabbbb9dffb92e440a65bbadbae5c349ccecdc5c
Commit Graph

894 Commits

Author SHA1 Message Date
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
deathride58 94eeb5981d Merge pull request #4646 from Citadel-Station-13/upstream-merge-34031 
[MIRROR] Prevents Nar-Sie from being double-summoned
 2018-01-03 18:56:31 +00:00
Jordan Brown 1d235c0a72 Merge pull request #34031 from ShizCalev/narsie-summons 
Prevents Nar-Sie from being double-summoned
 2018-01-03 12:25:35 -06:00
Jordan Brown a642a1c298 Merge pull request #34040 from AnturK/maraudercheck 
Fixes marauder ghostclick jump
 2018-01-03 11:58:42 -06: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 943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 
[MIRROR] Adds blob roundend report.
 2018-01-02 14:56:12 -06:00
LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -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 3ee2569379 Update borer_event.dm 2018-01-01 14:07:17 -06:00
LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -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
LetterJay 88df151bd7 Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947 
[MIRROR] Last resort now requires a confirmation.
 2017-12-31 02:52:29 -06:00
F-OS 9c8959f2ff Last resort now requires a confirmation. (#33947) 
* Update headcrab.dm

* fixed

* fuck

* Update headcrab.dm

* Update headcrab.dm
 2017-12-31 02:24:53 -06:00
oranges 3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing 
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-30 16:59:07 -06:00
LetterJay a160997587 Update talisman.dm 2017-12-30 13:32:02 -06:00
LetterJay a8d6fa7fd7 Update runes.dm 2017-12-30 13:31:51 -06:00
LetterJay 6c59d4134a Update ritual.dm 2017-12-30 13:31:24 -06:00
LetterJay f0214dd06d Update overmind.dm 2017-12-30 13:31:13 -06:00
LetterJay b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJay a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895 
[MIRROR] Corrects abductor uncuffing message
 2017-12-29 06:47:56 -06:00
LetterJay 80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873 
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
 2017-12-29 06:26:06 -06:00
LetterJay c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
XDTM 6eabea6a71 Corrects abductor uncuffing message (#33895) 
* Corrects abductor uncuffing message

* breaks
 2017-12-29 02:56:30 -06:00
MoreRobustThanYou 07ba4e8189 The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873) 2017-12-29 02:55:03 -06:00
Robustin a9a94f7aed Dead cultists can now cross Reebe's "Servant Blocker" (#33558) 
* Dead Cultist Exception

* Servant blocker update

* Corpse balance

* Lets corpses pass servant blocker

* Lets cult corpses pass servant blocker

* Update servant_blocker.dm

* Update open.dm

* Update servant_blocker.dm

* Update open.dm
 2017-12-29 00:29:19 -06:00
oranges 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay 2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJay 67ef791794 Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821 
[MIRROR] Fixes deleting handcuffs
 2017-12-27 03:05:33 -06:00
Jordan Brown 4499ff2fad Merge pull request #33834 from Xhuis/drone_hats 
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-26 18:38:42 -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 e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634 
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
 2017-12-26 05:29:42 -06:00
ShizCalev 3ea4e84719 Fixes deleting handcuffs (#33821) 
* Fixes deleting handcuffs

* cleanup
 2017-12-26 00:13:13 -06:00
LetterJay 50672ecf93 Merge pull request #4512 from Citadel-Station-13/upstream-merge-33752 
[MIRROR] Fixes eminence login
 2017-12-25 21:29:21 -06:00
LetterJay 91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584 
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
 2017-12-25 21:27:17 -06:00
Emmett Gaines 9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
LetterJay ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJay fff9f49738 Merge pull request #4516 from Citadel-Station-13/upstream-merge-33801 
[MIRROR] Fix download objective always greentexting
 2017-12-24 17:00:18 -06:00
LetterJay 144737d97d Merge pull request #4514 from Citadel-Station-13/upstream-merge-33784 
[MIRROR] Fix file path to aimalf.ogg
 2017-12-24 16:57:07 -06:00
LetterJay e7f926c153 Update _eminence.dm 2017-12-24 16:54:01 -06:00
Jordan Brown 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
Jordan Brown a111679821 Merge pull request #33801 from AutomaticFrenzy/patch/download 
Fix download objective always greentexting
 2017-12-24 15:02:57 -06:00
LetterJay d6c1c7ecc9 Merge branch 'master' into upstream-merge-33634 2017-12-24 02:39:35 -06:00
LetterJay b0671ed78a Update eminence_spire.dm 2017-12-24 02:38:47 -06:00
LetterJay aec1142ca1 Update _eminence.dm 2017-12-24 02:38:37 -06:00
Jordan Brown 7bcf4d466a Merge pull request #33784 from octareenroon91/patch-56 
Fix file path to aimalf.ogg
 2017-12-23 08:31:23 -06:00