Commit Graph

5975 Commits

Author SHA1 Message Date
AnturK
0dc9bd9d75 Fixes clockcult runtime 2017-10-07 07:46:18 -05: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
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
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Ashe Higgs
3f5696f91d Lizzers and plasmamen can now be servants of Ratvar (#31244)
* Removes racial discrimination from Ratvar's servants

* Activates plasma internals; thank you Y0SH1M4S73R!

* Update clock_cult.dm
2017-10-05 21:00:06 +13:00
Leo
6d08ebac83 Merge pull request #31287 from ShizCalev/wizard-name
Correctly applies wizard names
2017-10-04 21:26:19 -03:00
Leo
85d717350d Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
2017-10-04 21:25:31 -03:00
Jordan Brown
fdfc4137ee Merge pull request #31245 from Robustin/swordfix
Fixes Cult 2H Sword Soulshards
2017-10-04 14:02:26 -04:00
ShizCalev
e4a9de46dd Correctly applies wizard names 2017-10-03 19:25:53 -04:00
oranges
47a74d8cf3 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-04 12:14:32 +13:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00
KorPhaeron
380413fb8b Ports dash weapons to the dash datum (#31222)
* Dash katanas

* Properly assign the action

* Speaking of copypaste

* Its own file
2017-10-04 12:10:39 +13:00
oranges
23d8387f96 Merge pull request #31225 from KorPhaeron/multiz_swarmers
Swarmers work with multiz stations
2017-10-03 16:05:11 +13:00
Robustin
92193ed933 Removed random newlines 2017-10-02 15:11:08 -04:00
Robustin
9772ac1817 Bastard Sword Soul Fix 2017-10-02 14:58:37 -04:00
ShizCalev
f82adb7238 Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103)
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
2017-10-02 09:48:42 +02:00
KorPhaeron
cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
KorPhaeron
4178b702cf Swarmers work with multiz stations 2017-10-01 19:55:39 -05:00
Jordie0608
0223e449a3 fixes master 2017-10-01 16:35:02 +11:00
Robustin
ec3f7623df 2H Sword to the Cult Forge - Robustin's Github Adventure (#30887)
* Automatic changelog generation for PR #30056 [ci skip]

* Updated old code

* Slowdown does nothing, removed

* Updated Sprites and Fixes

* Mysterious block issue fixed

* Update cult_items.dm

* Update buffs.dm

* Update book.dm

* Update cult_items.dm

* Delete whirlwind.ogg

* Add files via upload

* Delete items_and_weapons.dmi

* Add files via upload

* Shard list fix

* Final error fix

* Review changes, dash datum

* Why was this a diff

* Uses roundstart time for delay

* Simpler Soul Storage
2017-10-01 01:01:50 -04:00
Leo
2a5216ca74 Merge pull request #31132 from KorPhaeron/lingfix
Fixes changelings being able to transform sting mobs that are transform sting immune
2017-09-30 23:35:45 -03:00
KorPhaeron
1c08cb004a Fixes meteors not working with multi z (#31137) 2017-09-30 23:32:25 -03:00
ShizCalev
3358cbb3b6 Cleans up some antag/event landmark checks (#31129) 2017-09-30 22:32:04 -04:00
AnturK
d293ee7340 Fixes liches losing spells 2017-09-30 14:52:21 -05:00
AnturK
423e76c8f1 Fixes some hardset dna misuse 2017-09-30 14:51:01 -05:00
vuonojenmustaturska
8b54685bd1 Cleanup to various loc assignments and nearby code (#31069)
* Let's hope i didn't break the game

* Requested changes

* missing one

* movetonullspace thing
2017-09-30 09:09:15 -04:00
KorPhaeron
5e5ff73046 Adds a var to minds to make them immune to conversion 2017-09-29 16:59:56 -05:00
KorPhaeron
5fa6ea42af Fixes changelings being able to transform sting mobs that are transform sting immune 2017-09-29 16:36:58 -05:00
ShizCalev
bc50c77570 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110)
* Stops revheads metagaming

* Added comment.
2017-09-29 15:59:57 +13:00
kingofkosmos
086d636b17 Alt-clicking descriptions when examining (#30988)
* Adds what alt-clicking does into examine-messages.

* whoops fix

* AI holopad examine remove

* Fixed cigarette pack alt-clicking.

* Spear alt-click-message set to show only if explosive lance.
2017-09-29 15:51:31 +13:00
oranges
27f15b7892 Merge pull request #31078 from pubby/opspawn
Cleanup operative landmarks
2017-09-29 15:47:47 +13:00
kevinz000
0ac476cd22 Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas. (#30722)
* initial commit

* bugfix

* Update changeling.dm

* Update datum_traitor.dm

* Update datum_traitor.dm

* Update objective.dm

* compile
2017-09-29 15:44:15 +13:00
Jordan Brown
4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Y0SH1M4S73R
f572f39faa AFK players count as dead for the assassinate objective (#31046) 2017-09-28 08:03:34 -03:00
KorPhaeron
962081866e Advanced camera consoles use a list for z lock rather than a single z level (#30661)
* Refactor Abductor Console

* Station lock
2017-09-28 12:24:34 +02:00
pubby
87401b5918 Cleanup nukeops spawns 2017-09-27 19:53:16 -05:00
Jordan Brown
38ffa0a139 Merge pull request #31016 2017-09-27 16:39:07 -04:00
Jordan Brown
de8c30189c Merge pull request #31032 2017-09-27 16:37:56 -04:00
Robustin
079bc63125 Revheads are now stealthier/harder to metagame (#30957)
* stealthier revs

* Stealthiest Revheads

* Update revolution.dm
2017-09-27 16:27:41 -04:00
AnturK
d226eda9f5 Here it is. 2017-09-27 13:21:51 -05: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
vuonojenmustaturska
7d30e345ca Fixes MMI to AI law transfer (#31017)
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
2017-09-27 10:52:03 +13: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
c36ee83ea4 typo 2017-09-26 13:00:53 -05:00
KorPhaeron
0a57c36c0a Doomsday will kill people on every station z level 2017-09-26 13:00:04 -05:00
AnturK
1304e83a76 Refactors cinematics. (#30888)
* Cinematic  refactor p1

* Refactors cinematics & related fixes

* Fix and cleanup

* Fixes survivor gibbing.

* qdel_null
2017-09-26 22:20:05 +13:00
Firecage
63f3423777 Makes borg modules and human species easily spawnable by admins from the mob spawn menu. 2017-09-25 23:12:52 +02: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
pubby
18f329a3f1 Datum abductors refactor (#30893)
* Datum abductors

* Update UFO crash ruin
2017-09-25 12:00:08 +13:00