Commit Graph

30853 Commits

Author SHA1 Message Date
Militaires 2431e709b8 CQC PR AGAIN and does what orangus wanted. (#20932)
A third martial art, CQC, has been added and is now available to nuke ops instead of sleeping carp

added leg sweeps by resting and then harming someone, so that you can flank someone by pretending to be crit or ded henk, not putting it in the recall teachings cause im a memer like that

new: CUSTOM CQC SOUNDS
2016-10-18 09:11:02 +13:00
TheCarlSaganExpress 4a93709088 The welder can be used to fix the display case and fire axe cabinet. (#20920)
* Fixes #20747.
You may now use your ID to unlock the display case.
Fireaxe cabinet and display case may now be repaired with the welder.

* Welder amount.

* Fire axe welder amount.

* Adds comments to the display case

* Captains display case now requires specops access
2016-10-18 09:08:42 +13:00
JJRcop b014ded568 Drying racks are now less like machines (#20987)
* Drying racks are now less like machines
you can no longer open their maintenance panel, or change out parts
they don't use a matter bin anymore, or a smartfridge circuit board

* Moved machine deconstruction's machine frame into a new proc: spawn_frame
removed drying rack's deconstruct override and overrides spawn_frame instead
2016-10-18 09:07:00 +13:00
oranges a51c1e6337 Merge pull request #20996 from Shadowlight213/presetlaptops
Adds laptop presets, fixes a few modular computer bugs
2016-10-18 09:04:01 +13:00
oranges d115c7dd10 Merge pull request #20991 from bear1ake/cyborg-stack-1
Fixes for cyborg stack using variant 1 #20521
2016-10-18 09:03:33 +13:00
PKPenguin321 5d040a87da stops paper planes from spinning (#20916)
* stops paper planes from spinning

the comment on it says it's specifically to stop spinning but it fails to do that

* does what oranges says i think

i hope i did this right

* orange's fix again

this one might work better
2016-10-17 21:44:20 +02:00
Cheridan 521dbbbabc Merge pull request #21006 from phil235/xenoeggfix
Fixes xenomorph not being able to open their eggs.
2016-10-17 13:48:08 -05:00
XDTM d7a05acfc4 Fixes silver slimes (#20988) 2016-10-17 00:47:19 -05:00
Cheridan ffbc6dbdf5 Merge pull request #20993 from erwgd/ReturnRollingPins
Re-add rolling pin to plank recipes
2016-10-17 00:46:40 -05:00
oranges c770004d0a Merge pull request #20989 from ChangelingRain/whereintheworldissaycodesandiego
Fixes simple animals with spans not keeping/using those spans when input didn't end with ! or ?
2016-10-17 14:26:14 +13:00
Kyle Spier-Swenson defde817a1 Adds 510 friendly support for client side fps. (#20985) 2016-10-16 20:15:37 +02:00
phil235 a7a8b11eff Fixes xeno attacking nests instead of unbuckling. You now attack the nest on harm intent and unbuckle on all other intents. 2016-10-16 20:12:51 +02:00
Joan Lung 7371d36b2c Merge pull request #20978 from phil235/StatueShit
Unfuck the statue code.
2016-10-16 12:43:43 -04:00
Joan Lung 1d075c6227 Merge pull request #20976 from phil235/bodybedQoL
Clicking a floor with a bodybag or roller bed now deploys them directly.
2016-10-16 12:42:27 -04:00
Jordie 841c723aa5 Merge pull request #20986 from phil235/RipleyGoliathHideFix
Fixes applying goliath hide to ripley not giving it proper armor.
2016-10-16 21:50:06 +11:00
Jordie ca5366bd6d Merge pull request #21004 from phil235/ActualLavaFix
Actually fixes the lava bug, I'm dumb.
2016-10-16 21:38:44 +11:00
phil235 ee14fbc4b8 Fixes xenomorph not being able to open their eggs. 2016-10-16 12:36:42 +02:00
phil235 e74de9b357 Merge branch 'master' of https://github.com/tgstation/-tg-station into damage_fix
# Conflicts:
#	code/modules/mob/living/carbon/carbon_defense.dm
2016-10-16 12:19:48 +02:00
phil235 671a7a80d4 Actually fixes the lava bug, I'm dumb. 2016-10-16 12:15:55 +02:00
Cruix 573ec3f9ba Fixed krav maga disarm not respecting NODROP. (#20975)
* Fixed krav maga disarm not respecting NODROP.

* Reverted change to krav maga disarm not giving the successful disarm message if the item it was disarming did not exists.
2016-10-15 22:12:16 -05:00
phil235 f14230b007 Fix bitflag mistake when lava burns stuff. (#20977) 2016-10-15 22:11:37 -05:00
Shadowlight213 9ce13d33de Adds laptop presets
Fixes various bugs
2016-10-15 17:39:59 -07:00
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
erwgd a2c459fd8a Added rolling pin to plank crafting 2016-10-15 21:01:37 +01:00
bear1ake e95c7ac465 Fixes for cyborg stack using variant 1 2016-10-16 02:32:16 +09: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 e25d4b8ad2 Merge pull request #20952 from yackemflam/patch-4
extinguisher is now caught up with fastmos.
2016-10-15 11:55:05 -04:00
Joan Lung f41ccb8997 Merge pull request #20967 from CyberbossJHCB/RCDDeservesBetter
Adds Camera Fire Immunity
2016-10-15 11:54:05 -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
Joan Lung 6b3b8e5ac3 Merge pull request #20972 from scoopscoop/wheredidtheshiftergo
Fixes cult shifter not spawning from archives
2016-10-15 11:52:58 -04:00
Joan Lung 29db7d7bab Fixes simple animals with spans not keeping/using those spans when input didn't end with ! or ? 2016-10-15 11:40:21 -04:00
phil235 f8c1bc6b7e Fixes applying goliath hide to ripley not giving it proper armor. 2016-10-15 12:26:37 +02:00
phil235 3367f0bde4 Fixes supermatter shard being destroyed by fire.
Buffs the hp of items, backpacks and clothes.
Fixes storage items not dropping their content if destroyed when worn by a mob.
Simplifies acid_melt() and burn(), we no longer try to acid/burn the content of an object that just burn/melted.
Nerfs damage to clothes from bombs when worn by a mob.
Fixes worn clothes taking damage when mob is hit by holo weapons.
2016-10-15 01:14:04 +02:00
scoopscoop 4a8d098cf0 Third time's the charm 2016-10-15 01:03:01 +03:00
scoopscoop f2521a22d3 Updated condition 2016-10-15 00:47:07 +03:00
scoopscoop 58df99ac67 Semantics 2016-10-14 23:14:19 +03: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
phil235 8c79ad4eab derp 2016-10-14 21:12:19 +02:00
phil235 cd825493cf Unfuck the statue code. 2016-10-14 21:04:52 +02:00
unknown 7e3257448c Removed a sleep from kinetic_accelerator/dropped() 2016-10-14 11:40:53 -06:00
phil235 64c528e115 Clicking a floor with a bodybag or roller bed now deploys them directly.
When deployed, the bodybag automatically starts "open" now.
Tweaked the amount of metal dropped by destroyed closets.
Bodybag structures no longer drop metal on destruction.
Admin deleting a critter crate no longer drops wood, but it still does when destroyed and the wood it drops is now all in a single stack.
Added a drop_material_amount var to closets to make the amount of material dropped vary for different closet types.
Click dragging a roller bed now puts it in your hand after being folded (for consistency with bodybag)
Cardboard box closets no longer have an integrity failure level (there's no opening mechanism to break in a cardboard box...). Same for bodybag "closets".
2016-10-14 17:47:16 +02:00
NikNakFlak 8e662c757d Adds new spookier lavaland ambience (#20949)
* fadsjkladsj;ladsfjads;asdfj

* Longer version
2016-10-13 22:14:13 -05:00
Cyberboss fe32e400e2 Only phil knows how to truly stealth nerf the AI 2016-10-13 22:26:14 -04: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 ab49aca161 Merge pull request #20936 from phil235/BarSignFix
Fixes bar sign being unwrenchable and changeable into a small sign.
2016-10-14 10:17:21 +13:00
coiax 451c59db5e RCD QoL buffs; windows and girders (#20903)
* RCDs have a Toggle Window Type verb

You can now toggle the type of glass built in the Grilles and Windows
mode, between normal and reinforced glass. Reinfored glass costs more.

Also, removed a random line implying RCDs were banned on shuttles,
except it didn't actually work or do anything.

* Girders can be deconned and finished with an RCD

* Moves low ammo message
2016-10-14 10:17:07 +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