Commit Graph

18208 Commits

Author SHA1 Message Date
oranges
9dcd96f604 Merge pull request #20933 from XDTM/Juicy
Grind slime extracts to get slime jelly/the chems inside
2016-10-18 09:11:37 +13:00
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
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
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
phil235
19cda8f56b Reorganizes the area folder to be more readable (multiple files instead of a big one with a million areas defined, moving areas that were defined outside the folder back into the folder).
Fixes issue with area power alerts, related to many space ruins using the same area and thus having multiple apcs in the same area with some wanting the area to be powered and some unpowered, leading to the area's power state constantly switching (area/procpoweralert() becoming the second most costly proc on the profile).
I fixed it by giving to many space ruins their own area (mostly those who have an APC).

Making a global list var "teleportbeacons" so we don't have to use "in world" to fing all tracking beacons used by teleporters.
2016-10-17 21:19:31 +02:00
XDTM
fc85b044cc Random stats 2016-10-17 09:02:26 +02:00
MrPerson
924d47f810 Fixes an issue where moving in no grav would push off movable objects when nonmovable ones were availablee 2016-10-16 22:53:46 -07:00
XDTM
d7a05acfc4 Fixes silver slimes (#20988) 2016-10-17 00:47:19 -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
KorPhaeron
7e831c5fa2 Adds sloths 2016-10-16 17:24:26 -05:00
Shadowlight213
18709e5ad7 Revert "Makes drag/drop that dont have any use call click" 2016-10-16 12:41:42 -07:00
Kyle Spier-Swenson
defde817a1 Adds 510 friendly support for client side fps. (#20985) 2016-10-16 20:15:37 +02:00
Joan Lung
7371d36b2c Merge pull request #20978 from phil235/StatueShit
Unfuck the statue code.
2016-10-16 12:43:43 -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
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
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
swindly
deca3e8fc1 diety -> deity 2016-10-15 16:12:37 -04:00
swindly
90f410b8ed fixes mispellings and makes grammar gooder 2016-10-15 14:29:14 -04: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
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
f9c71fbfb0 Made some slightly less uglier sprites for attack effects.dmi
Melee attacks, gun firing, and things being hit by bullets will now still give witnesses a message, but only if they are less than 3 tiles away. The attacker still doesn't get the message for its own attacks.

I added two arguments to visible_message(), one to specify the visibility range, and one to ignore a specific mob that shouldn't get the message.
2016-10-15 16:10:28 +02: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
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
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
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
phil235
43812be1b0 Merge branch 'master' of https://github.com/tgstation/-tg-station into hit_message
# Conflicts:
#	code/game/mecha/mecha_defense.dm
2016-10-13 20:04:59 +02:00
phil235
929c71e67c some tiny fixes 2016-10-13 19:27:00 +02:00
phil235
1ea0e47aa4 Visible_message() when being attacked by melee or projectile is replaced by a simple message only to the target instead of all viewers.
The message when firing a gun is removed.
To keep things balanced melee attacks (punches, alien attacks, animal attacks, etc...) now show a visual effect (similar to what we current have with item attacks.
Fixes muzzle flash effect not appearing for mech guns.
Fixes muzzle flash effect not appearing for certain ranged animal.
Fixes the item attack effect not being visible to camera viewers and mech occupants.
Fixes toy guns foam dart not dropping on the ground when shooting a mob on the same tile as us.
Fixes toy smg magazine sprite being invisible sometimes.
Fixes foam dart not facing the correct direction when fired.
Changes the bullet projectile sprite to have a slight tracer effect so as to be more visible.
2016-10-13 19:21:30 +02: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
Shadowlight213
108cdb21ce removes nobreath checks in lungs 2016-10-11 23:03:44 -07: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