Commit Graph

7963 Commits

Author SHA1 Message Date
oranges
2feb302b2d Fix duplicate species id's (#21287)
Unique id's for both krokodil humans and infectious zombies
Unique id for the ashwalker lizard subspecies

Uses the correct limbs_id var to ensure their icons reuse the
appropriate icons of correct species
2016-11-02 08:51:02 -04:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
AnturK
373cfd8303 Fixes dental implant runtime (#21256)
* Fixes dental implant runtime

* oranges is right
2016-10-31 19:51:54 +01:00
ExcessiveUseOfCobblestone
059a900e3f Removes Stray Space in Species_type in an effort to save the world. (#21286)
* Fixes Zombies / Flags for Species

* GO BACK

* Reverts Defines
2016-10-31 19:45:34 +01:00
oranges
92ee6b4b43 Merge pull request #21272 from ExcessiveUseOfCobblestone/zombiefix
moves speedmod to infectious zambies only
2016-10-30 18:58:24 +13:00
ExcessiveUseOfCobblestone
2966abffb0 moves speedmod to infectious zambies only 2016-10-30 01:54:53 -04:00
Mysak0CZ
ca58db328d [ready for review] APC minor tweaks (#21241)
I moved some things in APC's construction code.
Emaged and malf-AI-hacked APCs can now be fixed replacing theyir board (old one destroyed in process). - We emag and hack APC's board, not frame
You can now add/remove APC's wires even if board is secured
Removing APC's and SMES's terminal no longer ignore current tool's speed
You can repair APC's cover (only if APC is not compleatly broken) by using APC frame on it, while electronicks are still in place
You can no longer unlock AI-hacked APCs, throught AI still can
    closing APC's cover will lock it
2016-10-30 09:34:51 +13:00
Joan Lung
7262c16328 Merge pull request #21243 from lzimann/selflog
You can see your own attack log once again
2016-10-29 15:50:55 -04:00
Joan Lung
663ef769f7 Reworks Guvax (#21202)
Guvax is now targeted; invoking it charges your slab to bind and start converting the next target attacked in melee within 10 seconds. This makes your slab visible in-hand.
tweak: Above 5 Servants, the invocation to charge your slab is not whispered, and the conversion time is increased for each Servant above 5.

Using Guvax on an already bound target will stun them. The bound target can resist out, which will prevent conversion.

Sentinel's Compromise is now targeted, like Guvax, but can select any target in vision range.

Sentinel's Compromise now also removes holy water from the target Servant.

Clicking your slab will cancel these scriptures.

Both of these will change your cursor, to make it obvious they're active and you can't do anything else.


Convert times are faster at very high servant amounts, but it's much easier for 1-on-1 conversions to go wrong and have the target escape. (Though the binding makes early conversions slightly easier.)

Resist time for the binding is a flat 4 seconds, and moving/being moved while chanting will break it immediately.
Formula for conversion time is 5 + (0.5 for each valid servant above 5) seconds up to a maximum of 10 seconds at 15 servants.
2016-10-29 18:16:21 +13:00
Lzimann
90d76b652c You can see your own attack log once again 2016-10-28 17:35:22 -02:00
Razharas
2c9e07698f Merge pull request #21186 from ChangelingRain/rangedreference
Ranged abilities now have a reference to their user
2016-10-26 20:21:17 +04:00
chowdermcarthor
c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
Cyberboss
e67133b606 Hotkeys for target selection and run/walk (#21039)
* About time someone did this

* also this

* One almost got away

* From '`' to 'B'

* Mercy kill this PR pls

* Help message

* You could've told me how that took forever

* Update help
2016-10-26 18:57:38 +13:00
Joan Lung
09b426df79 Splits various massive clockwork cult code files up into various folders (#21177)
* Splits various massive clockwork cult code files up into various folders

* JUST1C4R

* 4BSURD

* this is faintly horrifying to look at

* that's right i don't need to double it, just to swap the order
2016-10-26 09:50:04 +13:00
Joan Lung
f6738d0e2a Ranged abilities now have a reference to their user 2016-10-25 11:18:51 -04:00
lordpidey
3b16e0c83e Adds LARPing. (#21053)
* Starts to add a new wizard spell, based on the LIGHTNING BOLT! LIGHTNING BOLT! LIGHTNING BOLT meme.

* Adds spell to spellbook, and makes it functional.

* Fixes compile error

* Casting the spell now automatically readies your throw.

* Pitchforks don't auto throw

Summon pitchfork no longer also auto throws.
2016-10-25 15:13:16 +13:00
oranges
aa0ec8b5a7 Merge pull request #21155 from kevinz000/thanksphil--)
[FIX]Anomalous Crystals are now RESISTANCE FLAGS = INDESTRUCTIBLE
2016-10-24 22:55:17 +13:00
Joan Lung
40d331ab5a The Judicial Visor no longer requires an open hand to use (#21138)
* The Judicial Visor no longer requires an open hand to use

* SMITE

* ew ew ew
2016-10-24 22:54:04 +13:00
Cyberboss
858acdc9f3 Fixes NOHUNGER (#21090)
* Im actually going to die of flu, send help

* REEEEEE howd this get here

* Dammit Joan my everything hurts!

* Cant sleep. shit code. travis loves me

* dammit orange. this was supposed to be easy!

* Specifically disallow the "vigourous" from pop up
2016-10-24 00:13:44 +13:00
kevinz000
c5de1b93ff wew 2016-10-22 21:52:41 -07:00
Cheridan
091e101b77 Merge pull request #20869 from Shadowlight213/gaswalkers
Moves breathing from species to the lung organ
2016-10-21 11:34:19 -05: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
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
phil235
1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02: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
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
7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05: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
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
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
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
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
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
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
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
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
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