shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

308 Commits

Author SHA1 Message Date
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
YPOQ
42372b8d04 Fixes eminences not being recognized as servants of ratvar (#37070) 
* Fixes eminences not being recognized as servants of ratvar

* Readds istype check
 2018-04-10 20:21:37 -05:00
AlexTheSysop42
360eb223b3 Adds check to keep observers from being recognized as servants of ratvar (#36800) 
* Comments out code to try to fix a bug

* fixes servant ghosts being trapped on Reebe

* protip: next time don't commit to master

* ghosts no longer count as servants

* Undoes ghost check, moved to is_servant_of_ratvar

* change istype to isliving
 2018-03-31 06:17:10 -05:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
Dax Dupont
643e58714e Fixes the eminence getting spammed by blessed tiles. (#34866) 
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
 2018-01-27 23:21:48 -06:00
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament 
Correct spelling of armament
 2018-01-26 03:01:01 -06:00
LetterJay
f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611 
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
 2018-01-24 20:45:16 -06:00
LetterJay
ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285 
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
 2018-01-24 20:44:15 -06:00
ExcessiveUseOfCobblestone
eb1a6b89ef One can no longer use cogscarab as a form of Eminence priority. (#34611) 
Cogscarabs are meant to build, and wasting an integral (building) slot for something you can get as a ghost so you get priority is shitty to both other ghosts and team (the second one being an admin issue).

If you want to go eminence, you can roll for it as a ghost like everyone else.
 2018-01-24 14:03:08 -06:00
Robustin
f8c349ea54 Gives clockwork marauders a reasonable cost/cooldown (#34285) 
balance: Clockwork marauders now take more time (+3s) and power (7x) to create.
balance: The "recent marauder" time limit is now 60 seconds, up from 20. The limit now has a significantly smaller effect on summon time but will act as a further cap on marauder summoning until it has passed.
tweak: The marauder cap will now only account for living cultists.
 2018-01-24 13:53:03 -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
LetterJay
ab002f56be Merge pull request #5046 from Citadel-Station-13/upstream-merge-34778 
[MIRROR] Fixes invalid pollCandidatesForMob args
 2018-01-23 08:24:31 -06:00
Leo
326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob 
Fixes invalid pollCandidatesForMob args
 2018-01-23 06:42:08 -06:00
oranges
07b94d7bd9 Merge pull request #34750 from ShizCalev/clockwork-current- 
current sanity check in ark of the justicar
 2018-01-23 01:42:36 -06:00
deathride58
28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633 
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
 2018-01-21 22:42:53 +00:00
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633) 
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
 2018-01-21 13:34:04 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
LetterJay
c18ce156e2 Merge pull request #4989 from Citadel-Station-13/upstream-merge-34625 
[MIRROR] Brass skewer runtime fix
 2018-01-21 11:56:50 -06:00
LetterJay
d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497 
[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
 2018-01-21 11:55:52 -06:00
ShizCalev
af995d8683 Brass skewer runtime fix 2018-01-21 02:57:17 -06:00
Dax Dupont
4826dec880 Adds holy vision (Some mobs can now see blessed tiles) (#34497) 
* Blessed turfs are visible to people who care about blessed turfs

* A better way

* Adds holy vision

* Compacts special types

* space space space

* Glowing

* Final Solution

* wraith

* bawhoppen has autism and we must hugbox

* Implements feedback
 2018-01-21 02:04:47 -06:00
ShizCalev
0a98435694 Fixed runtimes 2018-01-21 01:24:26 -06:00
deathride58
ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452 
[MIRROR] Reduce the volume of the death sound on clock work mobs
 2018-01-19 19:36:18 +00:00
Trevor Serpas
5d2ddd833a Reduce the volume of the death sound on clock work mobs (#34452) 
* Reduce the volume of the death sound on clock work mobs

I edited the .oog since I did not see a way in the code to lower the volume. This will affect all code/game/gamemodes/clock_cult/clock_mobs which at this moment is only maraders and the eminence.

* Non-clockwork mobs are no longer affected

adjusted volume in the code so that the clockwork golems, ratvar, and ratvar plushies are unaffected by the audio file changes
 2018-01-19 08:58:29 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
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
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
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
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
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
Jordan Brown
a642a1c298 Merge pull request #34040 from AnturK/maraudercheck 
Fixes marauder ghostclick jump
 2018-01-03 11:58:42 -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
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
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
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