Commit Graph

17973 Commits

Author SHA1 Message Date
phil235 f6db08af2e Contents_explosion() tweaks (#20934)
* When any object is hit by an explosion, we no longer always call ex_act() on all its contents indiscriminately.
The default contents_explosion() does nothing and it's overriden for certain objects only like storage items, machines with occupants, mechs.

I've also overriden handle_atom_del() for many objects so that any sudden deletion of an object referenced in an object var of its container properly nullifies such references, avoiding potential runtime and updating the container's icon_state (e.g. admin-delete a mixer's beaker and the mixer's sprite updates immediately).

I've tweaked bomb effect on worn clothes, having some armor but not 100% now still protects your clothes somewhat.

Fixes some arguments of ex_act in living/ex_act() and other mobs.

* derp and map fixes.

* dem map fixes, man.

* More work on code that use implants, simplified now that we can use the "implants" carbon var.

* some fixes

* more typos and fixes.
2016-10-16 10:01:37 +13:00
Joan Lung ca26b0ff5c Ruins will now remove flora (#20957) 2016-10-15 18:00:24 +02:00
Joan Lung 973e5c4012 Nerfs blobs (#20947)
* nerfs the blob

* we're already doing that gosh this code is old
2016-10-15 17:59:13 +02:00
Joan Lung 7027568fee Merge pull request #20974 from Cruix/minor_ka_fix
Removed a sleep from kinetic_accelerator/dropped()
2016-10-15 11:57:01 -04:00
Joan Lung b43cbcd6e2 Merge pull request #20951 from Shadowlight213/integritreee
Fixes modular computer integrity
2016-10-15 11:55:37 -04:00
Joan Lung 953fa2247d Merge pull request #20959 from Shadowlight213/Amenginefix
Fixes am engine not handling power change properly
2016-10-15 11:53:20 -04:00
Supermichael777 8af82e6fe4 Fixes triple citrus not displaying its sprite and the Changeling sting recipe. (#20960)
* Delete drinks.dmi

* Fixes that name

* and removes the conflicting recipie
2016-10-14 21:51:42 +02:00
unknown 7e3257448c Removed a sleep from kinetic_accelerator/dropped() 2016-10-14 11:40:53 -06:00
NikNakFlak 8e662c757d Adds new spookier lavaland ambience (#20949)
* fadsjkladsj;ladsfjads;asdfj

* Longer version
2016-10-13 22:14:13 -05:00
Cuboos bf079d29d4 POWER TOOLS TAKE 2. (#20923)
New power tools for the CE! It's like goof's golden tools but less memey and makes more sense, power tools are much faster than normal tools and take the place of two.

Hand drill, activate to switch between between screwdriver bit and bolt bit (screwdriver/wrench)

Jaws of life, activate to switch between a cutting head and prying head, can also open powered doors like a xeno. Cutting head cuts your head off if you suicide with them. I wanted to make the prying head gib your head but i couldn't figure it out.

Reworked how construction handles sounds and added a new "usesound" var to obj/items. This is useful if you want to add another tool or item that makes a send when it's being used. Also useful if you want to replace a sound for an item or if you have an item with a choice of sounds (like if you have two versions of a sound sound you want to play)

CE now gets a unique white tool belt, exactly the same as a regular tool belt, just a re-skin.

CE also spawns with the new power tools and an experimental welder, CE will be the ONLY one to spawn with these tools, might make him a more valuable target for traitors. I figured this would be acceptable considering most heads are not antag enabled (i think)

Also i added a welding tool sound for reasons... figured might as well add some more sounds while i was reworking it.
2016-10-14 10:19:23 +13:00
oranges c99ad55703 Merge pull request #20941 from ChangelingRain/blobflashbanging
Blobs now properly consider flashbangs to be energy damage
2016-10-14 10:16:26 +13:00
Shadowlight213 e0fd4c53bd Fixes am engine not handling power change properly 2016-10-13 08:40:53 -07:00
Cheridan 1b4317d5ef Merge pull request #20914 from ChangelingRain/godsarebetterthanmechs
You can no longer hide in a mech to avoid gods
2016-10-13 02:06:59 -05:00
Shadowlight213 f6ef394d12 Fixes modular computer integrity 2016-10-12 19:40:08 -07:00
oranges dac03dfc07 Merge pull request #20931 from tgstation/RemieRichards-activehands
put_in_hands() now prioritises the active hand
2016-10-13 12:57:03 +13:00
ma44 e453ee2784 Adds a mining gear crate to cargo (#20943)
Cargo can now order a 2500 supply point crate that requires a QM or above to unlock. This crates contains a explorer suit, compact pickaxe, mesons, and a bag to hold ore with.


Allows QM to employ more miners so they don't have to get crappy EVA suits when they can just order everything a miner should have to find some ores.
2016-10-13 12:56:43 +13:00
Razharas 7753b04a6c Makes drag/drop that dont have any use call click (#20774)
Makes drag/drop that dont have any particular defined behaviour be treated as just click on the dragged object
2016-10-13 12:55:05 +13:00
XDTM 07aa842064 Xenobiology QoL (#20910)
You can now store monkey cubes in bio bags; using bio bags on the consoles will load them with the monkey cubes inside the bags.
2016-10-13 12:50:07 +13:00
Joan Lung 4e0a3deb73 github is being kind of weird about these conflicts 2016-10-12 10:00:45 -04:00
phil235 6cfd99ec00 Moving shit around and APC repair bugfix (#20912)
* Moving shit around so turfs aren't defined in code/modules/mining .
Fixes APC's integrity not being reset to max when a broken APC is repaired.

* derp

* More turf and turf procs moved.

* fixing merge conflicts again.
2016-10-12 09:48:47 +02:00
Cheridan 34bc9935ac Merge pull request #20924 from KorPhaeron/frogs
Frog fixes and updates
2016-10-11 23:25:13 -05:00
XDTM 87d1b821d8 Slime cores deleted on use (#20902)
Exhausted slime extracts will now dissolve instead of leaving useless used slime extracts.


Slime cores won't be consumed if the reaction outputs chemicals, or if the slime core has extra uses from a cerulean slime.
2016-10-12 15:48:59 +13:00
uraniummeltdown e9f9b5a600 You can now collect ore by walking over it with satchel equipped (#20735)
* addressed a few problems

* it finally works perfectly

* all good now

* better code
2016-10-12 15:30:39 +13:00
Joan Lung 98357c94ef Blobs now properly consider flashbangs to be energy damage 2016-10-11 19:55:19 -04:00
oranges 437129c3f1 Merge pull request #20888 from erwgd/ReplacementLightsHaveMetal
Replacement lights no longer require 60 metal in autolathe
2016-10-12 09:02:15 +13:00
phil235 cc947b1eeb Fixes spacevines being immune to melee attack (typo). (#20907)
Fixes robotic legs missing a side to their sprite.
Fixes blob attacks destroying objs below intact floors (the blob's attack does not remove the floor's tile)
Now all objs hidden below floors don't take damage from fires, instead of just pipes and cables.
2016-10-12 09:01:03 +13:00
Remie Richards ea51704f03 ``put_in_hands()`` now prioritises the active hand 2016-10-11 18:28:52 +01:00
Razharas 5ced570b3e Merge pull request #20856 from ChangelingRain/coreprocessidiocy
You can now deconstruct AI cores that contain no AI
2016-10-11 18:39:12 +04:00
Joan Lung 208e6e5edf Ash flora can now spawn in small patches 2016-10-11 10:04:32 -04:00
Joan Lung 9fae29a33c Merge pull request #20884 from lzimann/alerts
Makes cyborg "Show alerts" verb a browser datum
2016-10-11 09:58:56 -04:00
Joan Lung b3b7421cd8 Merge pull request #20921 from TechnoAlchemisto/day1fixes
Fixes Cacti and Plant Bags
2016-10-11 09:47:19 -04:00
Cheridan 62f59a0682 Merge pull request #20894 from lzimann/cancelbuttons
Adds a cancel button to some inputs
2016-10-11 07:38:36 -05:00
KorPhaeron c241d6079e Frog fixes and updates 2016-10-10 23:33:48 -05:00
TechnoAlchemist 2b796efe54 Fixes plant bags and cacti. 2016-10-10 21:12:58 -07:00
Jordie 1d6d7bda9c Merge pull request #20763 from TechnoAlchemisto/Alchemy_pt_1
Adds plants to lavaland
2016-10-11 13:03:21 +11:00
TechnoAlchemist 622b0ce405 Desc fix 2016-10-10 18:57:20 -07:00
TechnoAlchemist ef2efe392b Merge errors, removes istype. 2016-10-10 18:34:36 -07:00
TechnoAlchemist cd60b5c3dd removes commented code 2016-10-10 17:47:37 -07:00
Joan Lung d296d7eb78 You can no longer hide in a mech to avoid gods 2016-10-10 19:30:40 -04:00
Cheridan 75fe1f07b9 Merge pull request #20881 from Jordie0608/newadminmetaisforcingbirdboatsotheycanavoidunjobbanningpeople
Various fixes to admin topic
2016-10-10 16:24:41 -05:00
Cheridan 9ab0b7a27e Merge pull request #20813 from optimumtact/theurcat
Improvements to simple animal make_baby and Runtime
2016-10-10 16:10:49 -05:00
Incoming5643 a963658b8e Makes transit space unjauntible, and removes a few spells restriction from the wizard den. There's nothing there you can't reach normally now except a mob that wants to kill you and some meat. (#20853)
Fixes an area error that was allowing jaunting from the wizard den after a LOT of creativity.
The radios in the wizards den should work now.
Fixes a rouge airless tile in the den.
Recompiles z2 as a dmm as it was erroring on mapmerge and it was in a very strange form that didn't match up with other dmm formated maps. It looks like everything is ruined, but I assure you everything just swapped around.
2016-10-11 10:06:08 +13:00
Joan Lung f51444d8fa Improves some cult rune checks (#20872)
* sword in the dawn

* don't fade away

* it's dumb, but not my problem.
also rearrange these checks~
2016-10-11 10:05:25 +13:00
Shadowlight213 335c0ad690 Ports VG's antimatter engine shield sprites and adds the AM engine to cargo (#20744)
* Ports VG's antimatter engine shield sprites

* crate name
2016-10-11 09:57:04 +13:00
TechnoAlchemist f1d3ea724a who cares about burning bowls?! I dont. 2016-10-10 13:47:55 -07:00
XDTM 8d63a5ee0f Synthflesh can heal dead people (#20819)
* Deadflesh

* Carbons only
2016-10-11 09:46:28 +13:00
KorPhaeron 4e68c2ca95 Adds frogs (#20775) 2016-10-11 09:43:31 +13:00
kevinz000 cb295db91a remake (#20762) 2016-10-11 09:41:43 +13:00
Joan Lung 937b68bfc4 Emags will no longer work on Ratvar-serving cyborgs (#20845)
* That's right, your master is RATVAR.

* CONTROL YOUR INDENTATION

* it's a good thing there are people actually reviewing my code now

* syntax
2016-10-11 09:20:29 +13:00
TechnoAlchemist d434ac96f4 Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/modules/mining/lavaland/ash_flora.dm
2016-10-10 13:20:25 -07:00