Commit Graph

48 Commits

Author SHA1 Message Date
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -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
Ashe Higgs f9b5026382 Marauder balancing pass (#32448) 2017-11-07 10:56:51 -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
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
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
Joan Lung 1516a56970 Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV (#29325) 2017-07-28 20:44:09 -03:00
Joan Lung 5b48b94c6f Reworks Clockcult's standard conversion method, removes Taunting Tirade 2017-07-24 17:16:08 -04:00
Joan Lung 977e72c148 Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures 2017-07-13 10:58:17 -04:00
Joan Lung 2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Joan Lung 405fc7b0fe Adds Prolonging Prism as an application scripture (#28164) 2017-06-07 22:43:03 -03:00
Joan Lung db323e2e3b Tinkerer's Daemons are no longer totally disabled if you drop below the servant requirement 2017-06-06 10:32:07 -04:00
Joan Lung d5e608807f Only human and silicon servants can help recite multi-invoker scriptures (#28049) 2017-06-04 21:22:55 -03:00
Joan Lung 74f00e629f Cult fixes (#26990)
* Cult fixes

* ha ha whoops

* whoooops

* whoops x3 combo
2017-05-07 00:51:40 -03:00
Joan Lung a91353dd44 Tweaks the cost of some of the Application scriptures affected by the previous cost tweak (#26864) 2017-05-04 18:06:08 -03:00
Joan Lung 1234425e0a Mania Motors now do minor damage and continue to affect targets after they leave its range (#26783)
* Mania Motors now do minor damage and continue to affect targets after they leave its range
2017-05-04 00:15:16 -05:00
Joan Lung 5d3e0b0b21 Clockwork component generation is twice as fast, but scriptures cost up to twice as much (#26814)
* Clockwork component generation is twice as fast, but scriptures cost about twice as much

* sssh

* gotta double that, too

* slab text fix that nobody looks at anyway
2017-05-03 13:40:55 -03:00
Joan Lung cae2092ebd Replaces Mending Motor with Mending Mantra (#26611)
* Replaces Mending Motor with Mending Mantra

* fix

* fixfix
2017-04-29 13:56:29 +12:00
Cyberboss 9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Joan Lung cf53b6ebed Clockwork Marauders now have a never for this round option 2017-03-21 19:43:56 -04:00
Joan Lung 6366735430 Comments a bunch of clockcult code (#25241)
Also fixes one or two bugs, like wraith specs being ten times as fast as they should be
2017-03-19 14:41:06 -03:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Joan Lung db45acbf70 Anima fragments will very gradually self-repair (#24442)
* Anima fragments will very gradually self-repair

* little higher
2017-02-26 09:44:19 -06:00
bgobandit b22e689417 Fixes some more goddamn typos and bad writing. (#24095)
* fixes some more goddamn typos

* ree

* ...

* seething hatred for typos

* wew
2017-02-17 14:10:58 +13:00
Joan Lung e96403e4f3 Updates some clockcult descriptions (#24031)
* Updates some clockcult descriptions

* mmm
2017-02-14 10:12:22 +11:00
Joan Lung 18ddf92cda rangefixes 2017-01-31 12:04:22 -05:00
Joan Lung 29e8ce0141 Swaps the tier of Vitality Matrices and Fellowship Armory 2017-01-31 11:57:54 -05:00
Joan Lung 1367c1a23a Merge branch 'master' of https://github.com/tgstation/tgstation into scripturecosts 2017-01-29 18:46:37 -05:00
Joan Lung 3cb86a189b Marauder tweaks (#23397)
🆑 Joan
rscadd: Clockwork Marauders now grant their host action buttons to force them to emerge/recall and communicate with them, instead of requiring the host to type their name or use a verb, respectively.
rscdel: Clockwork Marauders no longer see their block and counter chances; this was mostly useless info, as knowing the chance didn't matter as to what you'd do.
rscdel: Clockwork Marauders can no longer change their name.
tweak: Clockwork Marauders have a slightly lower chance to block, and take slightly more damage when far from their host.
bugfix: Fixes a bug where Clockwork Marauders never suffered reduced damage and speed at low health and never got the damage bonus at high health.
/🆑

Fixes clockwork mobs being unable to toggle clockwork structures.
Fixes marauder and vitality matrix healing not actually working on humans???
Fixes the anime fragment joke never actually showing up.
2017-01-30 10:24:46 +13:00
Joan Lung 50d54c3e9e Clockwork scripture can no longer require more components than it consumes 2017-01-29 12:02:14 -05:00
Joan Lung 9796779ea1 Volt Void is now a more useful scripture (#22897)
* Fixes targetted clockcult scripture not logging

* easy

* volt void

* big damage

* i knew
untimely

* i was
untimely

* i am
untimely

* hmm

* brief delay

* inaccurate
2017-01-23 08:06:57 +04:00
Joan Lung d89fe0b870 Fixes clockcult's overreliance on Replicant Alloy (#22824)
* Fixes clockcult's overreliance on replicant alloy

* i did it like that for a reason

* comment

* =
2017-01-10 09:57:01 +13:00
bgobandit be8e2011dc you people and your spelling 2017-01-07 03:25:39 -05:00
bgobandit 0d4249a5ba addictive typo fixing 2017-01-07 00:55:09 -05:00
Joan Lung b21b9089d6 Clockwork Marauders are more powerful but easier to kill (#22414)
* Clockwork Marauders are more powerful but easier to kill

* weaker, fine
2016-12-28 09:06:51 +13:00
Joan Lung 5224512d55 Replaces Servant cyborg emagged modules with some limited scripture and tools (#21632)
* Replaces Servant cyborg emagged modules with some limited scripture and tools

* not THAT limited

* sorry standard borg

* bugfix
2016-11-20 17:51:11 +01:00
Joan Lung 56c9628e4d Reciting Scripture is no longer menu-based (#21474)
* Reciting scripture is no longer menu-based

* better descnames

* unacceptable

* something something readability or possibly unreadability pick one
2016-11-13 10:46:04 +13:00
Joan Lung 045c6e643b Renames Guvax to Geis (#21445)
* Renames Guvax to Geis

* right
2016-11-10 15:18:15 -06:00
Joan Lung 3ecdd5b13c You can now quickbind most Scripture to action buttons (#21379)
* You can now quickbind most Scripture to action buttons

* fixes

* short descs

* slow updating may be bad

* that'd be very bad

* no flickering

* center

* short&sweet

* fixes
2016-11-08 11:33:08 +13:00
Joan Lung d63d6149c9 Some small clockcult fixes 2016-11-01 15:05:27 -04:00
Joan Lung 7ba3c93db9 Merge branch 'master' of https://github.com/tgstation/tgstation into definecomponents
Conflicts:
	code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
	code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm
	code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
2016-10-30 11:29:55 -04:00
Joan Lung 6b930dccaa Improves the Clockwork Slab's Recollection (#21242)
* Improves the Clockwork Slab's Recollection

* efficiency!

* classesssss

* are the right hands your hands?
find out today!

* clapping

* -n

* a bugfix
2016-10-30 16:20:03 +01:00
Joan Lung add4f8ecf0 Component IDs are now defines 2016-10-29 11:40:33 -04:00
Joan Lung 856e54f0b8 Clockwork structures that use power will now handle APC power better (#21219)
* Clockwork structures that use power will now handle APC power better

* TRUUUUE POWEEEERRRR

* I don't actually need this check, because we don't have power without an apc and a cell
2016-10-29 11:34:22 +13:00
Joan Lung 09b426df79 Splits various massive clockwork cult code files up into various folders (#21177)
* Splits various massive clockwork cult code files up into various folders

* JUST1C4R

* 4BSURD

* this is faintly horrifying to look at

* that's right i don't need to double it, just to swap the order
2016-10-26 09:50:04 +13:00