Commit Graph

18208 Commits

Author SHA1 Message Date
oranges
3189f205e0 Merge pull request #21062 from swindly/pillshere
Makes action button for a dental implant include the pill's name
2016-10-21 22:51:20 +13:00
Cheridan
a37d117768 Merge pull request #21089 from phil235/swarmerFix2
Fixes swarmer attack (stamina) on human/monkey being able to destroy clothes.
2016-10-20 23:30:56 -05:00
Screemonster
60180cb0fd Makes the antitamper mechanism prevent tampering 2: electric boomaloo (#20893)
* Sanitises input on abandoned crates

* Makes anti-tamper mechanisms detect tampering.

* Makes explosion trigger on take_damage() instead.
2016-10-21 15:30:46 +13:00
Shadowlight213
0b37b5a99b Yay for Phil! 2016-10-20 19:21:34 -07:00
Joan Lung
7f89fdf39f The range for combat-y visible messages is now a define (#21077) 2016-10-21 15:20:14 +13:00
oranges
6df23a7095 Merge pull request #21043 from CyberbossJHCB/ZeBrainIzConzumed
Xeno chestbursting gibs brain
2016-10-21 15:15:04 +13:00
AdamElTablawy
5b2bedcb51 adds cargo and engi access to allowed accesses for launching mining aux base (#21048)
* cargo, engi, and head access added to aux mine base

* FUCK
2016-10-21 15:14:47 +13:00
Cheridan
fc54564a69 Merge pull request #21079 from phil235/Fixingshit1
Fixes Capture the flag elements being destroyable.
2016-10-20 21:08:07 -05:00
Cheridan
3a53b7fcd4 Merge pull request #21080 from phil235/runtimefix1
Runtime fixes (cryo & monitor computer)
2016-10-20 20:57:53 -05:00
phil235
1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00
Cyberboss
ef88ba8794 Adds transfer amounts to spray bottle 2016-10-20 18:39:59 -04:00
Cheridan
5646efe406 Merge pull request #21076 from Shadowlight213/swapstat
Fixes stat check in swap minds event
2016-10-20 17:17:43 -05:00
Shadowlight213
df3b78702c Fixes. compiles now 2016-10-20 08:29:59 -07:00
Shadowlight213
d96068ce12 Fixes botany snpcs not offloading stuff into the smartfridge. (#21070)
Adds a couple of debug vars to snpcs.
2016-10-20 12:54:50 +02:00
oranges
4404a01b51 Add logging for spiderlings spawned by botany + refactor spawning code (#21037)
Adds a log with an admin message for when spiderlings are spawned by a
botany user adding mutagen or adminordrazine, it also adds a helper
method for spawning atoms that supports a callback post spawn to
modify variables specific to the atom
2016-10-20 12:46:24 +02:00
yackemflam
0ae63e71ef Because mso said so 2016-10-19 21:52:05 -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
phil235
1abee1468d Fixes swarmer attack (stamina) on human/monkey being able to destroy clothes. 2016-10-20 01:10:16 +02: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
Leo
7dcce3c087 Makes shuttles great again 2016-10-19 17:43:58 -02:00
phil235
d21b929599 barrier need to be destroyable apparently. 2016-10-19 21:16:12 +02:00
phil235
a70c960e80 Fixes a runtime when cryo cells are processed when their gas mixtures has an empty gases list var.
Fixes runtime with computer monitor linked to apc having no cell.
2016-10-19 21:10:29 +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
phil235
d7019f7f3a Fixes Capture the flag elements being destroyable. 2016-10-19 19:43:36 +02:00
Cheridan
7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05:00
Shadowlight213
0ae485cfbf fixes stat check in swap minds event 2016-10-19 08:41:55 -07: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
phil235
029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
phil235
240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
swindly
6fe50ae243 names pill action button and fixes icon 2016-10-18 19:27:17 -04: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
Cyberboss
d3280e9e8a Chestbursters eat your brain 2016-10-18 09:24:42 -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