Commit Graph

178 Commits

Author SHA1 Message Date
Tad Hardesty
af7014efe9 Refactor chasm paths to be more sane (#32701)
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 10:30:45 +01:00
ShizCalev
e79626f1b8 Fixes whiteship ruin board swap (#32869) 2017-11-19 22:04:06 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Tad Hardesty
9fb288a601 Fix a few syntactic aberrations (#32284) 2017-11-02 03:21:14 -06:00
ShizCalev
5c6903874e Fixes conflicting IDs 2017-10-20 12:16:13 -05:00
vuonojenmustaturska
a927f2a64c expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
2017-10-19 11:57:10 +02:00
Leo
c1450bbdc1 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 22:20:42 -02:00
ShizCalev
243932d482 Corrects caravan ambush tool speed (#31792)
* Corrects caravan ambush tool speed

* subtype
2017-10-17 08:21:41 -05:00
ShizCalev
721df8dacf Cleans up some istypes not using helpers 2017-10-16 15:30:30 -04:00
bgobandit
807bbbbd45 Fixes various spelling and grammar errors. (#31764)
* Fixes various spelling and grammar errors.

* check

* CEASE

* i cant stop
2017-10-16 15:06:10 -04:00
kevinz000
b83d777119 Removes a bunch of sleeps/spawns and makes a few booleans defines (#31553)
* spawn/sleep removal part 1

* sleep/spawn/src. removal

* fixes type paths in timers

* Fixes some variable passing

* Why do I have to do this 20 times to get it right..?

* Why do I have to do this 21 times to get it right..?

* Update suicide.dm

* Update software.dm

* Update paper.dm

* Update cable.dm

* Update ninjaDrainAct.dm

* Update hypospray.dm

* Update vocal_cords.dm

* Update touch_attacks.dm

* Update revenant_abilities.dm

* woops

* Update revenant_abilities.dm
2017-10-14 19:53:17 -04:00
ShizCalev
477384ce78 Refactors away mission & space ruin area code (#31512) 2017-10-12 11:46:30 -06:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
kevinz000
09b07dad64 Ashwalker tendrils now drop everything on victims before consuming (#31177)
* Update ash_walker_den.dm

* Update ash_walker_den.dm
2017-10-01 15:21:23 -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
81e5154a70 Various grammar fixes 2017-09-17 01:46:41 -04:00
Leo
c11e3115b5 Changes golem shell attackby istype chain to use an assoc list instead of an istype chain (#30542)
* Changes golem shell attackby istype chain to use an assoc list instead

* Makes the check use merge_type as opposed of item type
2017-09-10 21:18:12 +02:00
Robustin
e4ce50d959 Golem shells can no longer fit in bags (#30498)
* Automatic changelog generation for PR #30056 [ci skip]

* RIP pocket army

* Delete AutoChangeLog-pr-30056.yml
2017-09-08 13:45:49 -05:00
ShizCalev
4917204a1c Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:41:46 -05:00
Jordan Brown
41eed1ce22 Merge pull request #30079 2017-08-23 12:04:50 -04:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Supermichael777
b31dc125d8 put him to the mat and start counting 2017-08-20 23:24:00 -04:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
shizcalev
5d15fb46cb Relocates baseturf helper 2017-08-16 11:29:59 -04: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
shizcalev
da70c2f851 Baseturf helper update 2017-08-12 13:27:27 -04:00
Jordan Brown
3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
shizcalev
c55ed74e4a Removed extra space. 2017-07-31 11:24:35 -04:00
shizcalev
1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
Fox-McCloud
29f1779885 Improves several Sound Loops' Performance 2017-07-30 12:23:37 -04:00
shizcalev
863ff3f826 Corrected comment. 2017-07-26 12:27:38 -04:00
shizcalev
12c279e537 less vague paths, inconsistency with derelict path 2017-07-26 12:25:39 -04:00
shizcalev
ab183d2e1d fixed compile 2017-07-26 05:48:07 -04:00
shizcalev
8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
Joan Lung
6d7e3f2281 Lava is no longer a plating subtype (#29463) 2017-07-25 22:16:02 -03:00
Joan Lung
ca06bc22e6 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#29232) 2017-07-17 12:25:01 -03:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
AnturK
d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Ashe Higgs
b057e19ec0 Adds collapsing stone tiles (#29042)
* Adds collapsing tiles

* Adds the 'falling' variable

* adds checking for kosms

* Changes, chasm works now

* VERY fast tile falling at incredible hihg speed

* stuff!

* removes a weird define

* FALSE
2017-07-07 13:17:37 -04:00
Jordan Brown
4c74b213e1 Merge pull request #29034 from ChangelingRain/nohotvariants
Removes the hot variants of necropolis tiles and walls
2017-07-05 20:47:14 -04:00
Shadowlight213
91c92c788c Gives ghost roles their own assigned_roles (#29044)
* Gives ghost roles their own assigned_role in mind.

* vars

* skeleton
2017-07-05 20:45:48 -04:00
Joan Lung
b04ecfa6a2 hup 2017-07-04 15:42:22 -04:00
Joan Lung
3352767796 Fixes the legion door admin report/logging 2017-07-04 15:29:59 -04:00
Joan Lung
4889de7d9d Removes the hot variants of necropolis tiles and walls 2017-07-04 13:36:59 -04:00
Joan Lung
f6ad5996f3 Rethemes the ash walker nest to match the Necropolis (#28886)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks

* Rethemes the ash walker nest to match the necropolis

* fix some issues with the door version

* whoops

* run mapmerge tgm, does not tgm

* whoops

* whoops, all dirs

* tgm

* The bonfire has a grill

* nah just do what ergo wanted
2017-07-01 11:39:31 -03:00
Joan Lung
d165ecc6f2 Rethemes the Necropolis (#28857)
* Rethemes the Necropolis

* clen

* not clever enough, hmm...

* that's a bug. hello, bug.

* no message

* a terrifying Legion room. full of one (1) Legion.

* some tweaks, inside has actual floor type

* tweaks
2017-06-27 18:49:30 -03:00
Joan Lung
9dbe3253d0 Adds some neat tiles and walls for use on lavaland (#28760)
* Adds some neat tiles and walls for use on lavaland

* heh

* these, too

* misflip
2017-06-26 11:18:51 -03:00