Commit Graph

461 Commits

Author SHA1 Message Date
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Razharas
364964b5d5 Merge pull request #21818 from Thunder12345/tankplsgo
Added Anti-armour Launcher
2016-11-30 18:13:47 +04:00
Thunder12345
15fac9496d Changed name by order of Razharas 2016-11-30 13:54:25 +00:00
Mervill
b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
Thunder12345
d37e339876 Does the oranges and the Joan 2016-11-29 11:03:18 +00:00
Thunder12345
8959238828 Antitank Launcher 2016-11-28 16:46:30 +00:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
Joan Lung
78e03d4386 Merge pull request #21534 from lzimann/summonlesserspell
Adds the spell Arcane Barrage to wizards
2016-11-14 14:48:04 -05:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Lzimann
ba0af67f47 Adds a way to disallow having certains spells together. Only added to lesser summon guns/arcane barrage for now. 2016-11-13 20:10:52 -02:00
Lzimann
9d23e5ab3c Changes the Lesser Summon guns to Arcane barrage. 2016-11-13 17:30:42 -02: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
Xhuis
b22cc0543a [s] Adds new Halloween content (#21191)
* Adds new Halloween content

* Removes the delay

* Replaces archaic code

* Atomizes by removing unrelated tweaks

* Conflicts I

* Conflicts III, I think

* Unticks "halloween.dm"
2016-10-29 11:28:11 +13:00
kevinz000
7b3af25fbe Fixes hardlight bows (#21231)
Prevents them from infinite-hitting things by deleting them after they apply hit effects.
Also removes the secondary hit for a 30 brute primary hit instead of attempting to split damage as that's not working well.
2016-10-28 20:10:13 +13:00
kevinz000
06c35186e9 360noscope 2016-10-23 03:54:50 -07: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
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
phil235
cd825493cf Unfuck the statue code. 2016-10-14 21:04:52 +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
Joan Lung
ce13143d9d Replaces yet more istypes with helpers (#20806)
* uses more istype helpers

* oranges is inefficient
2016-10-10 17:48:35 +13:00
Joan Lung
b5b4037e2e More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now

* my oh my do we have a lot of these

* a fellow pedantic shit
2016-10-03 13:40:13 +13:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
Joan Lung
dff4db726a Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros

* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it

* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
2016-09-30 20:21:08 +02:00
phil235
2d2975f783 Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.

Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
2016-09-27 22:33:08 +02:00
kevinz000
125209cfd4 stuffs (#20633) 2016-09-26 14:55:12 +13:00
phil235
9124c65198 Adds some visual effects when ammo casings are fired and when projectiles hit things. 2016-09-14 02:57:47 +02:00
Joan Lung
179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
phil235
443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Joan Lung
5592d46594 touch lightly 2016-09-12 09:05:19 -04:00
Joan Lung
fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
Joan Lung
a6b3f3dc6e Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer 2016-09-01 18:45:36 -04:00
yackemflam
d3aec95d82 Sniper rounds now blow off limbs (#20209)
* Update bullets.dm

* Forgot about the non brutal rounds

* Update bullets.dm
2016-08-30 08:12:08 -05:00
Joan Lung
52ba13fbdf Remove xenobio's free antag (#20081) 2016-08-26 14:12:29 +12:00
Incoming5643
85cc99dc02 Staff of Change 2016 (#19925)
* Staff of Change 2016 Mid year whitelist pull!

It's now possible to turn into a cogscarb in the robot table
It's now possible to turn into a watcher, goliath, headslug, morph, stick man, stick dog, or lesser dragon(!) in the hostile animal table

* you no longer get an achievement for killing the lesser ask drake
2016-08-17 19:30:54 -05:00
KorPhaeron
100275b85f Kinetic Accelerator Overhaul 2016-08-13 18:06:28 -05:00
KorPhaeron
9ee67f942a Projectile Dismemberment and Wizard spellblade (#19783)
* Spellblade

* Plasma cutters and onback sprites

* Cleans up dismemberment projectile code

* Runtime fix
2016-08-11 15:43:29 +12:00
Joan Lung
bfb6dd5f94 The hyper-kinetic's explosion is now appropriately fast-looking (#19754)
* The hyper-kinetic explosion is now appropriately fast-looking

* close
2016-08-07 18:22:26 -05:00
Joan Lung
672577c956 Hyper-kinetics will no longer cause gibtonite to instantly explode (#19677)
* Hyper-kinetics will no longer cause gibtonite to instantly explode

* how... likely is that
2016-08-05 17:51:12 -05:00
Joan Lung
ce738acca7 touch 2016-08-03 12:46:32 -04:00
Joan Lung
40b487e5ad Plasma cutters have double range in low pressure 2016-08-02 11:46:48 -04:00
GunHog
e2cfcb0bd1 Aimed Fireball Spells! (#19030)
* Fireball Spell Changes

- Changes the fireball spell to be click-to-fire.
- Converted Devil and Wand fireballs as well.
- Moved some code to the /proc_holder level to work across the /alien
and /spell branches.

* Tweaks and Fixes

- Infernal Fireball is now a projectile and has the right explosion
values.
- Removed non-projectile spell versions of fireball, as they are unused
- Fixed fireball not seeking adjacent targets.
- Fixed incorrect bolding slashes.

* Fix

Fixes the fireball sometimes missing.

* Fixes and tweak

- Uses TRUE/FALSE defines instead of 0 and 1 for boolean variables.
- Ranged abilities now remove themselves tries to use an ability in a
disabled state. (Such as being knocked out)
- Define for the click cooldown.
2016-07-05 09:06:01 +12:00
Faltnor
d950565a3f Make Staff of Honkmother slightly less OP (#18802)
Just reducing the stun on it a smidgen so it doesn't stun like a rapid fire stun gun.
2016-06-22 03:23:05 -05:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
oranges
d6bdeb7124 Merge pull request #18455 from Incoming5643/no_bones_about_it
Mutantrace specflag omnibus
2016-06-20 08:15:34 +12:00
Jack Edge
821b3bc1b3 More spawn removal 2016-06-19 01:50:58 +01:00
Incoming
e33dd6dc70 Merge branch 'master' of https://github.com/tgstation/-tg-station into no_bones_about_it
# Conflicts:
#	icons/mob/actions.dmi
2016-06-18 18:57:17 -04:00
Incoming
64c829bd1f Fixes poited out errors and spelling mistakes
the floral suppository now mutates pod people
adds a proper icon for limb regeneration
slime people can't consume their own head
2016-06-18 18:42:39 -04:00
unknown
a0c866967f Splits languages into languages_spoken and languages_understood. 2016-06-16 18:50:32 -04:00