Commit Graph

225 Commits

Author SHA1 Message Date
Jordan Brown 38e8bdeaeb Merge pull request #34500 from Xhuis/recallfix
fixes a mass recall runtime error that prevented it from working
2018-01-17 08:09:10 -05:00
Xhuis 77b4d36056 fixes hte mass recall not working 2018-01-15 20:07:55 -05:00
kevinz000 0c1a1ee80b Lowers ark volume 2018-01-15 15:04:34 -06:00
ShizCalev 3d08996463 Replaces cached get_area vars for names (#34338) 2018-01-13 21:55:47 -05:00
Tad Hardesty 5caa23cbe3 Fix the Ark's z-level checks 2018-01-12 07:10:07 -08:00
Jordan Brown f1e3e9e9ed Fixes brass skewer grammar 2018-01-11 21:26:11 -06:00
kevinz000 18ec790ff3 Update ark_of_the_clockwork_justicar.dm (#34297) 2018-01-11 22:24:11 -05:00
Ashe Higgs f42d5a43ca 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 21:18:14 -05:00
oranges e84a7f3243 Merge pull request #33580 from Xhuis/defenses_balancing
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-31 11:58:41 +13:00
Emmett Gaines 4595c46dca turns the baseturf var into a part time list (#33705) 2017-12-25 20:10:08 -05:00
Ian Turk c7f00fb44c Prefixed all disability defines with DISABILITY to fix name collision with BYOND built in BLIND define 2017-12-22 23:49:41 -06:00
Ashe Higgs 3b37dae932 (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634)
* Fixes some Eminence issues

* Whoops!
2017-12-21 01:01:51 -05:00
Xhuis 2fedae91f8 Small clockcult balance patch 2017-12-20 11:51:22 -05:00
XDTM 146d167189 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
* Refactors disabilities into lists, allowing for independent disability sources

* defines

* Xhuiiiiissss

* living

* did that

* adjusted for traumas

* Updates pacifism and removed remove_all_disabilities from fully_heal to prevent issues.

* makes antur happy
2017-12-18 22:20:07 +01:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
AnturK 3d813853b5 Roundend report refactor (#33246)
* Roundend report refactor

* I won't be fixining every moved part but here you go

* Preparation for feedback

* Fixup

* First draft of feedback (wip)

* Simple version of feedback for custom objectives/explanation texts

* Debug verb removal

* Fixes & show again action button

* Admin objective handling

* Fix and first step of css standarization.

* Every time

* More css

* Fix

* Fixes, abductee datum, css tweak

* Feedback and css fix

* CLIENT DETAILS DATUM + CLIENT ACTIONS + spilled css fix

* Integrates clockult badcode

* Fix

* Fix lists in assoc feedback

* Unified antagonists and teams feedbacks, bumped up antagonists version

* Adds chat link to reopen the the report

* Fixes some clockcult stuff, passes antag name to feedback

* review stuff

* fix

* Adds some missing spacing

* Roundend corners, has css gone too far.

* Spacing between same antags

* Changeling and traitor objectives now have same spacing

* Wizar report typo fix

* Wrap brother team.

* Also move it to more relevant file

* Fixes cult summon objective

* Fixes roundend report for full-round observers

* Fixes wizard with apprentices roundend report

* Tutorial scarabs don't show in roundend anymore, adds some check_ticks

* Prettier station goals

* Merges roundend delay things

* Spread the lag around

* Fixes relogin qdeling eminence

* ckey -> key
2017-12-11 11:57:20 -05:00
Ashe Higgs 32c68a60bf Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!
2017-12-07 11:36:26 +13:00
Emmett Gaines 7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom 2817a1737b defines math 2017-11-22 17:36:58 -05:00
vuonojenmustaturska 39375d5cc2 Replaces a bunch of mob loops with hopefully better ones (#32786)
* Free codebase churn

* fixes dviewmob

* a commit

* Partial revert "Free codebase churn"

This reverts commit 9dd41b3860c331637bbc85e694dd32dc59768ad5.

* better fix to dviewmob

* renames living_mob_list to alive_mob_list, adds mob_living_list and carbon_list

* make some use out of the shiny carbon list

* make some use out of the shiny new living list

* more things, also make the mobs subsystem (Life) use living list

* bonus

* domo arigato mr. roboto

* compile fixes, also made the drone code less dumb

* better?

* make admin message prettier

* honk

* fixes blobs

* rev fixes

* one small thing
2017-11-16 23:08:40 +01:00
MoreRobustThanYou e66f5d9726 ok now i kinda tested the ark examine (#32445)
* No, I did NOT test the Ark examine.

* Update countdown.dm

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm

* OK JOAN FIXED

* Update ark_of_the_clockwork_justicar.dm
2017-11-09 21:57:24 -05:00
MoreRobustThanYou 200cce35da Fixes Ark examine (#32397)
* Fixes Ark examine

Fixes my own problem!

* WOOPS

* Update ark_of_the_clockwork_justicar.dm

* SECONDS!

* That looks a bit cleaner tbh

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm
2017-11-05 03:10:17 -05:00
MoreRobustThanYou 0f7a1fb3c3 Ark examine now uses DisplayTimeText (#32274)
* Ark examine now uses DisplayTimeText
2017-11-02 10:07:22 +13:00
kevinz000 dd1c94c6d5 Adds admin logging to clockwork ark activation (#32273) 2017-11-01 18:13:19 -02:00
MoreRobustThanYou 0f19e14e42 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 10:12:48 -02:00
Ashe Higgs 9404537a29 Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723)
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
2017-10-28 11:36:00 +13:00
KorPhaeron 529077d982 Ratvar summoning now ends the round/triggers mass proselytize (#31956)
* Slight changes to ratvar ending

* Tick check

* T

* Why Xhuis?

* Lots of fire

* That src made sense 10 minutes ago but no longer

* More commits than line changes

* Check Tick
2017-10-24 19:06:39 -04:00
vuonojenmustaturska 5e9d2bda7b Makes player-controlled minebots a target for ocular wardens (#31757)
* Makes player-controlled minebots a target for ocular wardens

* popularity reorder
2017-10-16 23:14:59 +02:00
Ashe Higgs 389db5e7f6 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 17:32:08 -06:00
Ashe Higgs aedc578975 The shuttle can no longer leave during clockcult rounds (#31327)
* Servants now win if the shuttle leaves

* Some more round feedback, a missed thing too

* Hostile environment!

* now it compiles!
2017-10-10 14:53:18 -04:00
Xhuis 037d1ffe37 Stops wardens targeting dead revenants 2017-10-07 14:49:29 -04:00
Joan Lung 9260c10566 Makes Ocular Wardens effective again (#31325)
* Makes Ocular Wardens effective again

* get that, too
2017-10-05 19:21:33 -05:00
KorPhaeron cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
Ashe Higgs 59e7559876 Clockwork cult rework: Post-merge micro-patch (#31044)
* Now that we're merged, we can do polish stuff

* each day before bed I honor ratvar
2017-09-26 19:58:45 -05:00
Ashe Higgs b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
ShizCalev 74f5a8c904 DisplayTimeText mk2 (#30969)
* Adds new helper, DisplayTimeText

* Removed unused define

Thought it would've been nice to have for the future, but I guess it's
fine to go without it.

* CBB

* Revamp

* Early returns

* More cleanup

* Proc cleanup

* Makes fraction only show if seconds is < 1

* Last cleanup

* Revert

* Corrected incorrect round time.

Dunno how nobody ever caught that it was incorrect on live servers, gg.
2017-09-24 19:58:58 -04:00
shizcalev 4f5658cfbb Cleaned up some decimal values. 2017-09-14 12:50:06 -04:00
KorPhaeron 10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
tortellinitony 224075694b Gets rid of manual overlay manipulation (#30454) 2017-09-06 23:38:24 -05:00
shizcalev 9be4b985a0 Updated clockwork cult to use DisplayPower() 2017-08-28 14:25:24 -04:00
Joan Lung c208d1efa3 Some more tweaks to Geis (#29662)
* Some more tweaks to Geis

* fixes

* it rounds to 0.1

* let's bring this back

* this is kinda shitty but eh

* continually smart

* oh right
2017-08-24 20:46:15 -05:00
Joan Lung 5c84310552 faster swap 2017-08-20 12:11:52 -04:00
Joan Lung e58c92cc05 Makes the Ark of the Clockwork Justicar much more fancy 2017-08-19 13:25:55 -04:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Joan Lung 2c3f0101a7 Fixes Geis except a little more this time (#29612)
* Fixes Geis except a little more this time

* ah.
2017-08-01 18:25:56 -05:00
Joan Lung d700efff9b nobody really reviews my code but me 2017-07-31 10:22:44 -04:00
Joan Lung 13e0b4190c Merge branch 'master' of https://github.com/tgstation/tgstation into geisrework
Conflicts:
	code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
2017-07-28 20:19:42 -04:00
Joan Lung 7209d00170 Sigils of Transmission can now drain power, but Interdiction Lenses have been removed (#29221)
* Sigils of Transmission can now drain power, but Interdiction Lenses have been removed

* bleh

* lensless

* mlem
2017-07-28 20:45:03 -03:00