Commit Graph

56 Commits

Author SHA1 Message Date
Tad Hardesty
f2dbe5cf13 Replace explicit z-level checks with defines (#33829)
* Replace explicit z-level checks with defines

* Rename turf_z_is_planet for consistency

* Use TRUE/FALSE in onSyndieBase
2017-12-29 14:40:06 -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
Ashe Higgs
eb6809bd4c Abscond and rifts return servants directly to the Ark (#32257)
🆑 Xhuis
tweak: Abscond and Reebe rifts now place servants directly at the Ark instead of below the "base" area.
/🆑

A few times, I've seen players unwittingly build defenses on top of the spawn points for themselves! While that's not too much of a problem in of itself, I feel that this way makes more sense and lets servants have a consistent area they know they will emerge from.
2017-11-02 09:52:14 +13:00
Ashe Higgs
0a5928518c Fixes being able to stack stargazers on one tile (#32085) 2017-10-25 22:44:20 -04: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
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
Joan Lung
91ef47fb8f just that 2017-08-07 11:42:37 -04:00
Joan Lung
26da0f40b5 Belligerent now has a visible indicator 2017-08-07 11:39:03 -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
eda1a04b7f Clockcult combat changes (#29326)
* Clockcult combat changes

* boom

* nah, less

* text changes

* compile

* more compile
2017-07-28 20:45:36 -03:00
Joan Lung
5b48b94c6f Reworks Clockcult's standard conversion method, removes Taunting Tirade 2017-07-24 17:16:08 -04:00
Ashe Higgs
c50dde75f0 Charging the clockwork slab now uses overlays (#29285)
* Charging your slab now uses overlays

* Adds the overlay template

* 🅱️ ixel 🅱️ erfect

* Fixes inhands

* a g o n y

* inhands!
2017-07-19 11:56:47 -04:00
Joan Lung
70dcd2ea9b Clockcult conversion has more explicit logging in what did it (#29007)
* Clockcult conversion has more explicit logging in what did it

* clang

* tweak
2017-07-04 15:40:45 -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
5508678098 Fixes Geis counting dead servants (#28477)
* Fixes Geis counting dead servants

* slightly more better
2017-06-15 20:55:21 -04: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
4a8fcdd395 Belligerent now prevents you from running even between chants (#25458)
* quick!

* Belligerent now prevents you from running even between chants

* one fuckup and git turns into a screaming hellspace populated only by pain

* glob

* seven seconds of pain
2017-05-01 11:48:55 -06: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
3b38202b44 Vanguard and Linked Vanguard are much more powerful when Ratvar is up (#25398) 2017-03-23 20:36:04 -03:00
Joan Lung
15c70b0cb8 Clockwork slabs will update less in places they didn't need to 2017-03-20 11:46:14 -04:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
oranges
6879e7bcfd Merge pull request #24194 from ChangelingRain/showcost
Quickbound scriptures now have the cost in their action button tooltip
2017-02-20 09:55:58 +13:00
Joan Lung
37ff70d48a Taunting Tirade is more true to its intent (#24234)
* Taunting Tirade is more true to its intent

* less powerful

* eh, they have vanguard if they need that
2017-02-20 09:40:32 +13:00
Joan Lung
7f9e14e519 Quickbound scripture now have the cost in their action button tooltip 2017-02-17 13:59:51 -05:00
Joan Lung
e96403e4f3 Updates some clockcult descriptions (#24031)
* Updates some clockcult descriptions

* mmm
2017-02-14 10:12:22 +11:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Joan Lung
ad6d33400e Vanguard now shows you how long you have until it deactivates. 2017-02-02 11:19:11 -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
50d54c3e9e Clockwork scripture can no longer require more components than it consumes 2017-01-29 12:02:14 -05:00
Joan Lung
82f984d365 Geis is more reliable early on (#23334)
* Geis is more reliable early on

* mmm

* better

* ' -> "

* indicator

* cheat

* a true buff
2017-01-28 01:14:40 -06: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
1692664503 Sentinel's Compromise will also affect oxygen damage (#23018) 2017-01-19 22:06:30 -05:00
Joan Lung
41373061c3 Misc clockcult grammar and fixes (#22983)
* Misc clockcult grammar and fixes

* easier
2017-01-16 13:30:14 +13:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Joan Lung
af45c959ad Fixes a warning (#22311) 2016-12-20 14:39:42 +01:00
Joan Lung
2435dfcd77 Taunting Tirade now actually requires that you keep your slab in your active hand (#22176) 2016-12-15 09:54:47 +01:00
Joan Lung
af8f0df02e You can't resist out of Geis below 5 servants 2016-12-13 16:42:21 -05:00
Joan Lung
a75f333f31 TGUI slab interface (#21987)
* tgui slab interface

* as is done
asking for help is a myth, taking help is not

* byond rides again

* do things and forget to fix them

* plus some bullshit

* info!
2016-12-08 10:17:28 -06:00
Jordie
4a37f57e7c Merge pull request #21911 from Mervill/m_intent
m_intent now uses defines
2016-12-04 19:34:42 +11:00
oranges
7ee8ad97b4 Merge pull request #21880 from ChangelingRain/itempickup
Items created by scripture will be put in your offhand if possible
2016-12-04 01:08:09 +13:00
Mervill
481cc07dcf m_intent now uses defines 2016-12-03 00:25:44 -08:00
Joan Lung
0fc959d694 Improves Geis binding resist (#21846)
* Improves Geis binding resist

* rrrrgh

* FINE LIMIT IT OKAY
2016-12-02 12:56:31 +01:00
Joan Lung
ea4247f8eb the, uh, proper path,,, 2016-12-01 15:35:08 -05:00
Joan Lung
2f05319836 Items created by scripture will be put in your offhand if possible 2016-12-01 15:32:28 -05:00
Joan Lung
6322dc26c7 Tinkerer's caches increase in cost every 4 caches, from 5 (#21834) 2016-11-30 17:00:49 -05:00
Joan Lung
a95660d700 Fixes Belligerent not updating the hud walk/run button 2016-11-23 15:49:26 -05:00
Joan Lung
4b1e9f4328 Scripture requirements are now defines 2016-11-13 11:05:47 -05: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