Commit Graph

4838 Commits

Author SHA1 Message Date
oranges 1f5889303d Merge pull request #21753 from ChangelingRain/quickbindmore
You can now quickbind up to 5 scriptures
2016-11-27 23:05:50 +13:00
uraniummeltdown 000a5fc502 Balancing Borers (#21726)
* borer reproduce chems 100->200, borer random detatch() removed, borer stun halved, borer infesting someone doesn't auto-unhide, borer event weight 20->15

* stun is 3
2016-11-27 23:03:46 +13:00
Xhuis 118fca35b8 Cleanup on aisle 892 (#21745)
* Plastic explosives now delete upon suicide

* Removes some old code

* Allows resisting out of straight jackets

* Verifies roller bed dock functionality

* Fixes lava's article

* Fixes Syndicate pinpointers being stuck to one mode

* Addresses some of @phil235's concerns

* Removes the Highlander left standing message
2016-11-27 22:59:34 +13:00
oranges ff5753847c Merge pull request #21737 from ChangelingRain/howhighofachanceisitthatitsjustafakeout
The Ark of the Clockwork Justicar no longer appears above mobs
2016-11-26 15:05:52 +13:00
Cyberboss e37f807941 Fixes the false armblade removal timer. Refactors addtimer (#21714)
* Clever girl...

* Make the addtimer unique param safe

* Refactor addtimer calls

* Moved the location of the define so the other SSs can use it
2016-11-25 22:05:58 +13:00
Joan Lung f89932bb38 You can now quickbind up to 5 scriptures 2016-11-24 21:59:36 -05:00
Joan Lung 9fc842c927 The Ark of the Clockwork Justicar no longer appears above mobs 2016-11-24 20:29:12 -05:00
kevinz000 87dbd65811 [READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)
* vroom

* wew

* a

* b

* morestuff

* .

* a

* .

* .

* basicsprites+extend/retract

* ...

* .

* thanks travis

* woops

* thankstravisv2

* redundence

* ishouldstopmakingsomanygoddamncommits+empdamage

* stuff

* ..

* ion_trails

* fixes_conflict_1

* fix

* compilesnow

* .

* fuck

* WIP: Multi Step Assembly

* thismightfixitthismightnot

* shoe-attachment

* noselfremoval

* wooops

* tweaksandcrashing

* runtimes

* runtimesfuntimes+crash update 1

* thisprobablywontcompile

* stillwip

* githubPLEASEWORK

* fixes conflicts 3/3

* REFACTORSUNTESTED

* fixingconflicts2

* fixingconflicts3/3

* updates

* stuffs

* ...

* stillWIP

* stufffs

* .

* ..

* runtimesfuntimes2

* stuffs2

* conflictfix

* ...

* fuck

* fix

* bah merge conflicts

* knockback_testing1

* conflictfixing...

* mergeconflicts

* plop

* socloseyetsofar

* tweaksandfixes

* conflicts

* fix

* fixes

* fix

* woops

* woops2

* hotfix

* ...

* flufftextandfixes

* test

* ..

* fix1/2

* stuff

* finallysomeoneteachesmehowtofixthisshit

* FIX

* why

* .

* bitflagsshitflags1

* bitflags-shitflags2

* bitflags-shitflags2

* bitflags_shitflags_4

* autofloating

* minerbuffgetthepun?

* notouchingfloors

* ...

* .

* f l o a t

* kek

* kek

* fixes

* fixes2

* sprites
2016-11-25 13:26:43 +13:00
Joan Lung 22c159ad3e Replaces the 'no cache' alert with an alert showing what you need for the next tier (#21689)
* Replaces the 'no cache' alert with an alert showing what you need for the next tier

* please make a base
please

* this can't be more dynamic, no

* duh, I can do this

* much better

* i'm just kor but with clocks
2016-11-25 13:25:56 +13:00
oranges 51382481bc Merge pull request #21699 from Shadowlight213/nobore
Makes borer event admin only
2016-11-25 10:10:59 +13:00
AnturK e0305a89a1 Merge pull request #21709 from ChangelingRain/belligerentwalk
Fixes Belligerent not updating the hud walk/run button
2016-11-24 21:22:30 +01:00
AnturK 8268f7ddaa Merge pull request #21693 from ChangelingRain/cyborgrepair
Fixes cyborg proselytizers being unable to repair clockwork structures with power
2016-11-24 21:20:18 +01:00
oranges fd9904d3d7 Merge pull request #21655 from lzimann/patch-16
Removes multiverse sword once again from wizards
2016-11-24 10:28:29 +13:00
Joan Lung a95660d700 Fixes Belligerent not updating the hud walk/run button 2016-11-23 15:49:26 -05:00
Shadowlight213 5c20e28ca0 makes borer event admin only 2016-11-22 22:28:23 -08:00
Joan Lung 33de967013 Fixes cyborg proselytizers being unable to repair clockwork structures with power 2016-11-22 19:13:58 -05:00
Cheridan bff5934406 Merge pull request #21671 from ChangelingRain/slabusability
Slab scripture text now starts off in compressed format
2016-11-22 11:29:16 -06:00
Joan Lung d4fa53d9ca Fixes clockcult round end stats showing up when they shouldn't (#21658)
* round end code is magic

* br
2016-11-22 16:23:27 +13:00
KorPhaeron af71d20561 The round ending on one server will send a news report to the other server (#21636)
* News Reports

* Misc

* Typo fixes
2016-11-22 12:30:30 +13:00
jakeramsay007 2fba2fb7db Borers can now no longer take control of implanted people or cultists (#21631)
* Borers can now no longer infest security officers or cultists

This is to solve the issue of borers ruining cult rounds by revealing
every cultist there is, as well as to stop borers from having instant
access to kill weapons by simply infesting a security officer, HoS, or
the Captain.

* Different plan

Now instead of being unable to infest, they cannot mind control.
Everything else is fair game.

* Fuck forgot to remove this bit

* Changed c to victim to fix error
2016-11-22 11:51:59 +13:00
oranges 05f9ea3b16 Merge pull request #21628 from Shadowlight213/banorrevert
Slightly nerfs borers
2016-11-22 11:49:12 +13:00
Joan Lung bce275ae4a Slab scripture text now starts off in compressed format 2016-11-21 10:40:19 -05: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
Leo 7a72cbb368 Removes multiverse once again 2016-11-20 11:12:57 -02:00
oranges 62d7363d04 Merge pull request #21624 from ChangelingRain/sigilfix
Fixes Sigils of Transmission trying to charge cyborgs with less than the minimum amount to charge missing
2016-11-20 14:53:50 +13:00
oranges e08208b310 Merge pull request #21623 from KorPhaeron/extendedfix
Fixes station goals not generating in extended
2016-11-20 14:53:38 +13:00
oranges 1e592f0e06 Merge pull request #21614 from Cruix/not_ling_chat_fix
[s] Fixed being able to speak while unconscious using alien or changeling channels
2016-11-20 14:52:28 +13:00
Joan Lung 6538cd1440 Clockcult end-round report now includes CV, caches, and scripture states (#21618)
* Clockcult end-round report now includes CV and scripture states

* hup
2016-11-19 14:21:41 -06:00
Shadowlight213 24450c5774 makes multiverse sword not work on bullshit mages (#21622)
Makes the multiverse sword not call the shuttle if it's already called.
2016-11-19 12:11:28 -06:00
Incoming5643 0f3b7d459e Adds the warp whistle and summon magic 2016 (#21599)
* Adds the warp whistle, and updates summon magic

* spelling counts

* Changes things up to account for qdeletion

* Don't code in the web editor
2016-11-19 22:31:42 +13:00
Shadowlight213 b0c21d06ff Borers now have a 10 second delay of waking up after the sugar leaves their host's system.
Borers now have a chance of losing control, based on their host's braindamage level
2016-11-18 18:34:13 -08:00
Joan Lung a1c15839ea Fixes Sigils of Transmission trying to charge cyborgs with less than the minimum amount to charge missing 2016-11-18 13:50:37 -05:00
Cheridan adadc497ff Merge pull request #21587 from ChangelingRain/geisbar
Geis now has a timer bar for how long you have until it wears off
2016-11-18 06:31:00 -06:00
AnturK 1b35066f07 Merge pull request #21589 from ChangelingRain/thisissuchaterribleidea
Adds an absurd impossible to balance blob chemical
2016-11-18 12:08:41 +01:00
AnturK 15fa1b23bd Merge pull request #21586 from ChangelingRain/nezbeer
Fixes invoking Nezbere not doubling tinkerer's daemon production speed
2016-11-18 11:54:16 +01:00
KorPhaeron 317cc2f56c Fixes station goals not generating in extended 2016-11-17 23:43:31 -06:00
unknown 555e54f6b1 Fixed being able to speak while unconscious using alien or changeling channels without the ability to speak on them. 2016-11-17 21:51:14 -06:00
coiax ec294edf34 Malf AI doomsday countdown is better formatted (#21567)
🆑 coiax
fix: The observer visible countdown timer for the malfunctioning AI
doomsday device is now formatted and rounded appropriately.
/🆑

It's centred, and no longer has decimals.
2016-11-17 12:32:37 +13:00
Joan Lung 7acf085ce4 Clockcult silicons can now activate Clockwork Structures (#21553)
* Clockcult silicons can now activate clockcult structures

* better
2016-11-17 12:29:36 +13:00
Joan Lung d691faba1b Clockcult Cyborgs can charge from Sigils of Transmission (#21558)
* Clockcult Cyborgs can charge from Sigils of Transmission

* better

* rip
2016-11-17 12:29:21 +13:00
Joan Lung f162d4d84a Refactors scripture quickbind (#21563)
* Refactors scripture quickbind

* =
2016-11-17 12:28:57 +13:00
Joan Lung 4b7813480a Adds an absurd impossible to balance blob chemical 2016-11-16 17:53:56 -05:00
Joan Lung d5713492b4 inaccurate, maybe 2016-11-16 16:55:22 -05:00
Joan Lung 7d139c0aa8 Geis now has a timer bar for how long you have until it wears off 2016-11-16 16:54:09 -05:00
Joan Lung 7d2a31f214 Fixes invoking Nezbere not doubling tinkerer's daemon production speed 2016-11-16 16:40:13 -05:00
Aloraydrel b51195768f Fixes the lore (#21551) 2016-11-15 15:40:37 -06:00
Joan Lung 78e03d4386 Merge pull request #21534 from lzimann/summonlesserspell
Adds the spell Arcane Barrage to wizards
2016-11-14 14:48:04 -05:00
KorPhaeron 43f43d8473 Scripture requirements are now defines (#21528) 2016-11-14 13:02:57 -06:00
oranges 680147d696 Merge pull request #21517 from ChangelingRain/revivefixes
Fixes Vitality Matrices and Raise Dead runes not reviving if the target happened to be in their body already
2016-11-14 19:09:39 +13:00
oranges 3114628719 Merge pull request #21501 from ChangelingRain/lessbelligerentscarabs
Cogscarabs have a faster proselytizer but are worse at guns
2016-11-14 19:03:07 +13:00