Commit Graph

1856 Commits

Author SHA1 Message Date
Mervill
c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
ExcessiveUseOfCobblestone
b30d0a5782 Fixes Revolver not being able to be redescribed
/obj/item/weapon already cover this so not sure why the revolver had its own.
2016-11-30 21:25:23 -05:00
MrStonedOne
76e1c6916f VV refactor 2016-11-30 12:49:21 -08:00
Razharas
364964b5d5 Merge pull request #21818 from Thunder12345/tankplsgo
Added Anti-armour Launcher
2016-11-30 18:13:47 +04:00
Thunder12345
cfd947f02c Reeeeeee 2016-11-30 14:08:26 +00: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
XDTM
23906c811a Adds more golem types, adds golem shell creation with adamantine slimes (#21708)
* Diversifies golems

* Golems

* fixes a bug

* Glass golem + species bullet_act support

* Glass shatter

* More golems

* Final changes

* Added to xenobio

* update

* minor space

* Totally bananas

* silly me

* what Joan said

* Updated titanium, plastitanium, and alloy golems.
2016-11-28 18:34:08 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
oranges
138e0500a4 Merge pull request #21554 from ChangelingRain/infinitygun
Fixes infinite cooldown KAs
2016-11-15 16:46:13 +13: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
Joan Lung
40448e731a Fixes infinite cooldown KAs 2016-11-14 11:34:18 -05:00
oranges
fea868c6ce Merge pull request #21526 from lzimann/patch-15
Tweaks the projectile speed to be a bit slower
2016-11-14 19:13:47 +13: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
1f4a5434c8 Fixes conflicts and updates spell description. 2016-11-13 22:05:57 -02:00
KorPhaeron
a643cb92f0 Dual (or more!) Wielding (#21397)
* Dual (or more!) Wielding

* Removes an extra line

* Shotguns can't be dual wielded
2016-11-14 12:02:00 +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
97055c5172 Removes horrible type check 2016-11-13 17:58:44 -02:00
Lzimann
dc1aebd403 Uncomment the throw/message after shooting with the regular enchanted mosin. 2016-11-13 17:44:30 -02:00
Lzimann
9d23e5ab3c Changes the Lesser Summon guns to Arcane barrage. 2016-11-13 17:30:42 -02:00
Leo
b0c95f03b0 Tweaks the projectile speed to be a bit slower 2016-11-13 12:07:38 -02:00
Cyberboss
6d1e30b062 Adds an exception for KAs 2016-11-09 16:07:39 -05:00
Cyberboss
bd9b35456d Fixes #21409 2016-11-09 09:07:04 -05:00
Mervill
9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
oranges
2a8b848f9b Merge pull request #21341 from swindly/its
Fixes some grammatical errors
2016-11-08 09:27:53 +13:00
phil235
bdd972418c Projectiles are now twice as fast. 2016-11-04 17:54:20 +01:00
swindly
6feff91f76 it's -> its 2016-11-02 19:26:04 -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
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04: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
kevinz000
7e364fd79a rip 2016-10-29 20:45:23 -07: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
kevinz000
5552a0ff02 fuck 2016-10-28 16:55:37 -07: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
Lzimann
90d76b652c You can see your own attack log once again 2016-10-28 17:35:22 -02: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
bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00
oranges
8bb359d083 Merge pull request #21158 from kevinz000/THREESIXTYNOSCOPELMAO
Makes sniper rifle bullets travel significantly faster
2016-10-28 09:59:47 +13:00
kevinz000
06c35186e9 360noscope 2016-10-23 03:54:50 -07:00
AdamElTablawy
9c82aab253 Makes sniper rifle descriptions less shit 2016-10-22 16:04:05 -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
phil235
1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +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