shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,183 Commits 5 Branches 0 Tags
57c829a2aab6dca828af5cdcf703dfd70f3be984
Commit Graph

935 Commits

Author SHA1 Message Date
deathride58
e8e6b3e770 Merge pull request #4899 from Citadel-Station-13/upstream-merge-34500 
[MIRROR] fixes a mass recall runtime error that prevented it from working
 2018-01-17 20:14:55 +00:00
Jordan Brown
b6150e8525 Merge pull request #34500 from Xhuis/recallfix 
fixes a mass recall runtime error that prevented it from working
 2018-01-17 07:10:30 -06:00
Ashe Higgs
33de2bd2f9 Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow (#34427) 
* Portal tweaks, and blocked atmos

* Update servant_blocker.dm

* Update servant_blocker.dm

* Update servant_blocker.dm
 2018-01-16 14:33:46 -06:00
Jordan Brown
af857d0c0b Merge pull request #34478 from ChangelingRain/runtimefix 
Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active
 2018-01-16 08:32:50 -06:00
kevinz000
c22c5fe25d Lowers ark volume 2018-01-15 15:05:19 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Leo
96679b1c0d Merge pull request #34347 from AutomaticFrenzy/patch/ark-z 
Fix the Ark's z-level checks
 2018-01-13 09:01:09 -06:00
deathride58
f90a0e66e0 Merge pull request #4784 from Citadel-Station-13/upstream-merge-34174 
[MIRROR] Sigils of submission now uncuff upon successful conversion
 2018-01-12 17:46:46 +00:00
deathride58
30bec7a1d0 Merge pull request #4775 from Citadel-Station-13/upstream-merge-34295 
[MIRROR] Fixes brass skewer grammar
 2018-01-12 17:42:56 +00:00
deathride58
8bfc56981b Merge pull request #4774 from Citadel-Station-13/upstream-merge-34297 
[MIRROR] Clockcult ark now teleports anything people are in to the station instead of just the person on destruction
 2018-01-12 17:42:39 +00:00
MoreRobustThanYou
de695abb26 Sigils of submission now uncuff upon successful conversion (#34174) 
* Sigils of submission now uncuff upon successful conversion

No more retards forgetting to uncuff after conversion

* Update clock_sigils.dm
 2018-01-11 21:51:30 -06:00
Jordan Brown
08da9ea5a0 Fixes brass skewer grammar 2018-01-11 21:26:43 -06:00
kevinz000
08339940c1 Update ark_of_the_clockwork_justicar.dm (#34297) 2018-01-11 21:24:31 -06:00
deathride58
eedf8eb101 Update cit_objectives.dm 2018-01-11 20:19:09 -05:00
deathride58
15f0b623ba Update cit_objectives.dm 2018-01-11 19:40:19 -05:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
deathride58
400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096 
[MIRROR] Cult will actually report victories now
 2018-01-10 19:57:56 +00:00
deathride58
df199bc940 Merge pull request #4736 from Citadel-Station-13/upstream-merge-34160 
[MIRROR] Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 19:57:35 +00:00
deathride58
f00252540b Merge pull request #4732 from Citadel-Station-13/upstream-merge-34185 
[MIRROR] Fixes feedback spell level var
 2018-01-10 19:56:30 +00:00
Robustin
1bd84a8f6b Cult will actually report victories now (#34096) 
* Cult victory fix

* Update cult.dm

* Correct cult victory report
 2018-01-10 03:46:55 -06:00
Jordan Brown
cb3506f319 Merge pull request #34160 from ShizCalev/cult-blade-drop 
Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 03:13:02 -06:00
Leo
56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs 
Fixes feedback spell level var
 2018-01-10 03:12:31 -06:00
oranges
3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining 
Late joiners also get summoned guns/magic
 2018-01-10 03:11:56 -06:00
deathride58
ecaf3546f1 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34105 2018-01-08 15:35:45 -05:00
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
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +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
oranges
1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -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