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

909 Commits

Author SHA1 Message Date
deathride58
b99f13f1bc Merge pull request #4717 from Citadel-Station-13/upstream-merge-33768 
[MIRROR] Fixes vitality matrices giving massively more vitality than they should
 2018-01-08 20:04:08 +00:00
Ashe Higgs
15f961958e Fixes vitality matrices giving massively more vitality than they should (#33768) 
* Fixes vitality matrix shenanigans

* Replaces the spawn_dust() with a variable check

* Update clock_sigils.dm
 2018-01-08 03:51:10 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
39614f685e Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100 
[MIRROR] Adds spaceturf check to blob overmind spawning
 2018-01-08 06:17:23 +00:00
deathride58
6b27e322b8 Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125 
[MIRROR] Makes the chaplain's soulshard require death
 2018-01-08 04:19:45 +00:00
deathride58
9decb2e2b2 Update overmind.dm 2018-01-07 23:18:28 -05:00
Dax Dupont
d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
MoreRobustThanYou
02b63e199b Adds spaceturf check to blob overmind spawning 2018-01-07 20:52:01 -06:00
Ashe Higgs
c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
deathride58
0ab9e0e209 Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:44:52 +00:00
deathride58
3a8e2870ca Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059 
[MIRROR] You now have to stand next to the decoy nuke disk and examine it to know it's fake
 2018-01-05 02:44:21 +00:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
deathride58
1bfba8fd50 Update nuclearbomb.dm 2018-01-04 20:56:53 -05:00
Leo
7a2955b96f Merge pull request #34060 from AnturK/brotherfix 
Fixes brothers not assigning properly.
 2018-01-04 15:17:56 -06:00
ShiggyDiggyDo
8a176e126e You now have to stand next to the decoy nuke disk and examine it to know it's fake 2018-01-04 15:17:43 -06:00
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