Commit Graph

7978 Commits

Author SHA1 Message Date
Fox McCloud
22ab7d6a4f Fixes Resist Fire Stuns (#21374) 2016-11-06 21:41:45 +01:00
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
Cheridan
53f869b6e3 Merge pull request #21369 from ChangelingRain/clockdrones
Standard drones will be converted to Cogscarabs by Ratvar
2016-11-06 09:32:09 -06:00
Cheridan
5d5e4de951 Merge pull request #21372 from phil235/pdapenshit
Pda overlays and pAi fix
2016-11-06 00:12:23 -05:00
Joan Lung
bf5905866a the dir change! 2016-11-05 21:07:32 -04:00
Joan Lung
0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit
Easy fix bundle
2016-11-05 19:41:27 -04:00
phil235
93ac302a2e Fixes pAI face not being updated when killed by EMP (or any non wipe/suicide death). 2016-11-05 03:22:20 +01:00
Joan Lung
f330bc3e7e ah, yes, that's not a constant 2016-11-04 20:58:31 -04:00
Joan Lung
3c2eb852a2 Standard drones will be converted to cogscarabs by Ratvar 2016-11-04 20:36:54 -04:00
phil235
b8e5bb22bc Moves bodybag closet into the closet folder where they should be.
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
2016-11-05 00:00:28 +01:00
phil235
26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235
51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
oranges
8ebf0c0ea3 Merge pull request #21320 from Mervill/master
Late joining won't runtime if the emergency shuttle does not exist (dev QoL)
2016-11-03 10:00:17 +13:00
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
Mervill
fbf85c3a1b Merge branch 'shuttlefix' 2016-10-31 21:36:25 -07:00
Mervill
acfd3004a0 Avoid runtimes in late joining, throw warnings at startup if the emergency shuttle does not exist 2016-10-31 21:26:39 -07: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