Commit Graph

18033 Commits

Author SHA1 Message Date
Shadowlight213
df3b78702c Fixes. compiles now 2016-10-20 08:29:59 -07:00
Shadowlight213
e7f9c7e7e0 removes breath mix vars from species
creates lung subtypes
2016-10-19 19:47:44 -07:00
Shadowlight213
865ca10c04 Merge branch 'master' of https://github.com/tgstation/tgstation into gaswalkers 2016-10-19 16:34:00 -07:00
Cheridan
873f95e601 Merge pull request #21088 from phil235/NecropolisFix
Fix a structure that should be indestructible.
2016-10-19 18:05:12 -05:00
Joan Lung
f7cb11bf69 Merge pull request #21040 from XDTM/Stats
Allows Pandemic to read stats, adds a properties list var to viruses.
2016-10-19 18:51:40 -04:00
Joan Lung
64db7e19b2 Merge pull request #21045 from CyberbossJHCB/OMGYouNerdsWillExploitEverything
Moves BSA reloading from the computer to the cannon
2016-10-19 18:47:41 -04:00
phil235
100ee04475 make necropolis gate indestructible again. 2016-10-20 00:12:35 +02:00
Cheridan
1b9e576b59 Merge pull request #21063 from phil235/AbandonedCrateFixo
Fixes being able to open abandoned crate with fire or bombs or stuff.
2016-10-19 13:07:04 -05:00
Cheridan
7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05:00
Leo
9cd27d136a Station Charter now keeps the server name in the game's window name after renaming the station (#21030)
* Charter now keeps the server name after renaming the station

* Changes instances of "world.name" to use the proper proc to get the station name.
2016-10-19 16:54:22 +13:00
TechnoAlchemist
44c558d438 Fixes deathnettle not yielding sulfuric acid too. (#21028) 2016-10-19 16:54:09 +13:00
phil235
a935952791 Fixes being able to open abandoned crate with fire or bombs or stuff. 2016-10-19 02:22:47 +02:00
TechnoAlchemist
14a1f7aef2 Fixes Vitrium Frothe metabolization issues. (#21035)
* Fixes vitfro healing not stopping after metabolized.

* . = 1

* CR's Fixes

* = TRUE and bowl pathing fix.

* fixes my stupid fucking mistake you animal you beast!!
2016-10-19 11:47:48 +13:00
oranges
08f1ca4797 Merge pull request #21027 from MrPerson/why_are_you_looking_at_branch_names_you_weirdo
Fixes an issue where moving in no grav would push off movable objects when nonmovable ones were available
2016-10-19 09:14:21 +13:00
yackemflam
a84b142876 Armor fix 2 electric boogaloo (#21007)
* Armor tweak

Standard armor vest and slim armor vest now have the same armor values

* Update armor.dm
2016-10-19 08:24:18 +13:00
Cyberboss
f8238ea8c4 TODO fix bsa reloading 2016-10-18 10:47:14 -04:00
MrPerson
5047dd7145 Plane master handling + new chemical Rotatium (#20707)
* Plane master handling + new chemical Rotatium

A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.

Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20

Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.

No pictures right now, I'll get some later. Sorry.

* Pay no attention to the commit behind the curtain

* Updates travis to 1346, the stable version for 510 for linux
2016-10-18 11:41:23 +02:00
lordpidey
499cb6c7db Minor devil fixes (#20770)
* Replaces OBLIGATION_DRINK with a much more appropriate fiddle reference
Attempting to clone soulsellers no longer works.  Fun things happen if you try.
Fireproof paper no longer becomes unreadable on burning.
Made a generic "Conjure item" spell as a superclass for the summon pitchforks.  These spells summon/unsummon an item directly into your hand.
You can no longer spam ghosts with the infernal revival contract.

* Adds the sprites for the golden violin

* Fixes compile error.

* Small changes for AnturK

* I speel gud.
2016-10-18 08:45:45 +02:00
Joan Lung
4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
oranges
fb30965905 Merge pull request #21022 from KorPhaeron/sloth
Cargo sloths
2016-10-18 13:38:18 +13:00
phil235
30ca862473 Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
All unique traitor steal objective item are now immune to all damage except severity=1 explosion.
Mobs on fire no longer get damage to their worn backpacks, belts, id, pocket stuff, and suit storage.
All backpacks are now nonflammable, and bag oh holding and engineer backpack are now fireproof.
Mob receiving melee attacks now only have its outer layer of clothes damaged, e.g. no damage to jumpsuit when wearing a suit.
Made all hyposprays (not just the CMO's) acid proof.
Made the singularity gen and tesla gen immune to fire.
2016-10-17 22:51:57 +02:00
oranges
c5e7e0ed2a Merge pull request #21031 from phil235/fix_spaceruin_map_shit
Area fixes
2016-10-18 09:28:35 +13:00
oranges
86a8d8a7f5 Merge pull request #20962 from phil235/hit_message
No more message spam when you witness someone being attacked or shot
2016-10-18 09:17:41 +13:00
oranges
25daa7b5f1 Merge pull request #20992 from swindly/spelling
Fixes various spelling/grammar/punctuation errors
2016-10-18 09:15:32 +13:00
oranges
d165c98420 Merge pull request #21018 from Shadowlight213/revert-20774-ClickAss
Revert "Makes drag/drop that dont have any use call click"
2016-10-18 09:14:09 +13:00
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