Commit Graph

31125 Commits

Author SHA1 Message Date
JJRcop 8d871d0777 Fixes chronosuit not checking if held items are chronosafe 2016-10-31 13:01:08 -04:00
Cheridan 2ae59bf7dc Merge pull request #21280 from ChangelingRain/axemeaquestion
Brass windows are now slightly harder to destroy
2016-10-31 11:08:44 -05:00
Joan Lung 571fefd307 Merge pull request #21276 from lzimann/patch-15
Fixes a runtime with weather
2016-10-31 11:45:55 -04:00
Joan Lung 550293de9a Merge pull request #21279 from lzimann/whydolingshaveamindswap
Removes ling "Swap form" ability
2016-10-31 11:43:17 -04:00
Cheridan d169779424 Merge pull request #21273 from bgobandit/immortalization
Adds a suicide message to an object lacking one.
2016-10-31 05:07:59 -05:00
oranges 0b0482a8a6 Merge pull request #21205 from MrStonedOne/patch-260
stop_procress now attempts to remove even if its not processing
2016-10-31 11:13:25 +13:00
oranges 3aea9c7feb Refactor apc attackby slightly to avoid a colon (#21263)
also adds a runtime for attackby interacting with an APC when it's not
on a turf (which should be impossible)
2016-10-30 22:57:13 +01:00
Kyle Spier-Swenson 3e67d90484 fixes plasma crashing clients/the server 2016-10-30 14:27:45 -07:00
Cheridan d91cb22de0 Merge pull request #21255 from ChangelingRain/definecomponents
Component IDs are now defines
2016-10-30 16:15:09 -05:00
Cheridan c5ff8b987e Merge pull request #21245 from MrStonedOne/byondinitclean
Cleans up some init procs from world start.
2016-10-30 16:05:29 -05:00
Leo 4f3d65d2be Fixes order by id button in library's computer (#21259)
* Fixes order by id button in library's computer.

* Removes comment that Remie didn't like

* Removes an accidental comment
2016-10-30 18:39:00 +01:00
Joan Lung 8cf817cfec Brass windows are now slightly harder to destroy 2016-10-30 11:51:21 -04:00
Lzimann ca73d87708 Removes ling mind swap. 2016-10-30 13:48:11 -02: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
Leo 03b4df6490 Fixes a runtime with weather 2016-10-30 11:59:42 -02:00
oranges ef38656c47 Tweak Duplicate object proc (#21069)
Better typepathing and doesnt try to update_icon on things
that don't have an update_icon proc defined

Also adds a holoitem flag so admin area copy doesn't make objects immune
to lava fire and acid
2016-10-30 13:41:54 +01:00
bgobandit 1999445b4f whoopsies 2016-10-30 04:06:06 -04:00
bgobandit 8b01341cfc adds suicide messag 2016-10-30 04:04:23 -04:00
bgobandit e7d0db78f1 The creepy clown epidemic has arrived at Space Station 13. (#21164)
* Implements a full spooky clown event for halloween.dm

* temp

* made requested fixes

* reeeee

* Clowns actually work now. Minor refactors to hallucination thanks oranges

* CLOWNS FINALLY WORK PROPERLY JESUS FUCK

* Fix incorrect prob method call
2016-10-30 19:51:19 +13:00
oranges d3bbe1634e Merge pull request #21248 from lordpidey/wallfix
Falsewalls are now less obvious on inspect
2016-10-30 19:16:32 +13:00
oranges 92ee6b4b43 Merge pull request #21272 from ExcessiveUseOfCobblestone/zombiefix
moves speedmod to infectious zambies only
2016-10-30 18:58:24 +13:00
ExcessiveUseOfCobblestone 2966abffb0 moves speedmod to infectious zambies only 2016-10-30 01:54:53 -04:00
Shadowlight213 3d3fef9998 changes so only humans and lizards 2016-10-29 22:29:45 -07:00
Shadowlight213 d01b76172d removes species change from Halloween event 2016-10-29 22:05:29 -07:00
oranges 3f0d87720f Merge pull request #21260 from Kraseo/doomslayer
Renames the doomslayer chainsaw to "THE GREAT COMMUNICATOR"
2016-10-30 10:06:37 +13:00
Mysak0CZ ca58db328d [ready for review] APC minor tweaks (#21241)
I moved some things in APC's construction code.
Emaged and malf-AI-hacked APCs can now be fixed replacing theyir board (old one destroyed in process). - We emag and hack APC's board, not frame
You can now add/remove APC's wires even if board is secured
Removing APC's and SMES's terminal no longer ignore current tool's speed
You can repair APC's cover (only if APC is not compleatly broken) by using APC frame on it, while electronicks are still in place
You can no longer unlock AI-hacked APCs, throught AI still can
    closing APC's cover will lock it
2016-10-30 09:34:51 +13:00
Joan Lung 7262c16328 Merge pull request #21243 from lzimann/selflog
You can see your own attack log once again
2016-10-29 15:50:55 -04:00
Kraseo 22ccfd8e62 RIP AND TEAR 2016-10-29 20:46:55 +02:00
Joan Lung 35f975699a BONUS 2016-10-29 12:04:26 -04:00
Joan Lung add4f8ecf0 Component IDs are now defines 2016-10-29 11:40:33 -04:00
Cheridan c265d5eecd Merge pull request #21216 from erwgd/PremiumMeds
Adds premium items to NanoMed Plus
2016-10-29 00:50:55 -05:00
Cheridan b1928c0a3a Merge pull request #21225 from ChangelingRain/cachewallsanity
Tinkerer's Caches no longer need to see a clockwork wall to link to it
2016-10-29 00:49:35 -05:00
Cheridan 725cee1a05 Merge pull request #21226 from MrStonedOne/patch-261
[s] And the rat races are off!
2016-10-29 00:47:39 -05:00
Cheridan 121271697f Merge pull request #21212 from optimumtact/ionlaws
Improves logging for ion laws
2016-10-29 00:45:32 -05:00
Joan Lung 663ef769f7 Reworks Guvax (#21202)
Guvax is now targeted; invoking it charges your slab to bind and start converting the next target attacked in melee within 10 seconds. This makes your slab visible in-hand.
tweak: Above 5 Servants, the invocation to charge your slab is not whispered, and the conversion time is increased for each Servant above 5.

Using Guvax on an already bound target will stun them. The bound target can resist out, which will prevent conversion.

Sentinel's Compromise is now targeted, like Guvax, but can select any target in vision range.

Sentinel's Compromise now also removes holy water from the target Servant.

Clicking your slab will cancel these scriptures.

Both of these will change your cursor, to make it obvious they're active and you can't do anything else.


Convert times are faster at very high servant amounts, but it's much easier for 1-on-1 conversions to go wrong and have the target escape. (Though the binding makes early conversions slightly easier.)

Resist time for the binding is a flat 4 seconds, and moving/being moved while chanting will break it immediately.
Formula for conversion time is 5 + (0.5 for each valid servant above 5) seconds up to a maximum of 10 seconds at 15 servants.
2016-10-29 18:16:21 +13:00
oranges 0a0c91e83b Merge pull request #21209 from Shadowlight213/headcheck
Removes the possibility of a head of staff being selected as a revhead.
2016-10-29 18:14:02 +13:00
oranges 6ed7d6681d Merge pull request #21208 from XDTM/WheelchairWizard
Wizards no longer need sandals to cast robed spells
2016-10-29 18:13:52 +13:00
TehZombehz cbb527fcec Adds Juiceboxes/Cartons + Apple juice & Choc. Milk (#21206)
* Adds Juiceboxes/Cartons

Adds craftable small cartons and juiceboxes.

* Housekeeping

Thanks, goof.

* Acting upon suggestions

Reduce cost of crafting from 2 to 1 sheet of cardboard, reduced volume
of small cartons from 25 to 15. +Housekeeping

* New Sprites + Fixes

Adds distinct grape, orange, and chocolate milk juice box colors (from
Nienhaus). Adds chocolate milk. Changes standard chocolate recipe to
compensate for chocolate milk change (soy milk chocolate bar recipe
remains the same). Fixes being unable to juice grapes in reagent
grinders.
2016-10-29 18:13:32 +13:00
oranges 67b9d2ffdc Merge pull request #21204 from TehZombehz/customsize
Custom food items are now w_class 2, allowing them to fit in papersacks.
Prevents you from putting custom food items into other custom food items. A minor bugfix that existed before that allowed for infinipizzas and infinicakes.
Gone are the days of:
That's a custom cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake slice cake. (Feature? You decide.)

It bothered me that a crafted sandwich can fit inside a paper sack, but a custom sandwich that's just two slices of bread put together is suddenly too big. On the other side of this, you can now fit entire custom cakes into paper sacks, which doesn't make a whole lot of sense. If this bothers anybody, it's easily fixed.
2016-10-29 18:12:09 +13:00
oranges d52cbb5024 Merge pull request #21247 from kevinz000/I-fixed-this-I-swear
At this point if this doesn't fix hardlight bows then bows as a whole are broken.
2016-10-29 18:08:47 +13:00
Joan Lung 6a5330dd5f Merge pull request #21222 from duncathan/patch-1
more debug stuff to solve atmos runtimes
2016-10-28 21:26:49 -04:00
Joan Lung 4187d7d397 Merge pull request #21213 from duncathan/itsgoodtobeback
Pipelines fail more loudly when they have null gas mixtures
2016-10-28 21:26:37 -04:00
Mike Long 4bd80f021d Fixes #21240 2016-10-28 20:52:03 -04:00
kevinz000 5552a0ff02 fuck 2016-10-28 16:55:37 -07:00
oranges 7e45df096b Merge pull request #21210 from ChangelingRain/quickshuttle
Arks of the Clockwork Justicar that do not summon Ratvar will still quick-call the shuttle
2016-10-29 11:34:53 +13: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 df4bc0a093 Fixed a few bugs with clockwork proselytizers (#21221)
* Fixed a few bugs with clockwork proselytizers

* condensed

* formatting

* proselytizer.

* i need more sanity checks I think this crashed something

* proper!

* better desc

* sanity! SANITY!
2016-10-29 11:34:03 +13:00
Xhuis f86a8c247e Adds the ability to transfer AI APC copies onto an intelliCard (#21068)
* Adds APC copy transferring

* Adds a missing variable

* First change

* Second change
2016-10-29 11:33:42 +13:00
Joan Lung 9eb2f1af32 Merge pull request #21224 from lzimann/dumblog
Adds proper logging to drop-bomb admin verb.
2016-10-28 18:33:30 -04:00