Commit Graph

363 Commits

Author SHA1 Message Date
paprka 64bc2abec3 sprite and fix 2014-08-07 14:52:40 -07:00
paprka 726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
Alex c79b9fe6bf Merge pull request #4336 from Incoming5643/bluepanties
Magic Mania 1⅔: Fixes #4335
2014-08-06 10:41:07 +01:00
Incoming 879f5d7c0e Changed it! 2014-08-05 19:51:08 -04:00
Incoming 4e91b2b655 Simplifies the species picking
Adds an update_icons() to minimize the effects of #4252, but it's still a problem
2014-08-05 14:11:45 -04:00
Incoming 2283b303ac Fixes #4335
Readds the 1/12 chance of stumbling out the bolt of change fully human with no mutantrace. It must have gotten lost during the mutantrace datumizing
2014-08-04 17:51:33 -04:00
Aranclanos ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
KyrahAbattoir fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures.
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
Ergovisavi 9d643789d8 Fix for issue #4173, both soulstone mobs (and construct derivatives) and staff of animation mobs (statues included) are now properly tagged with a faction that is unique to the person that created them, stopping a Wizard's animated mimics from attacking his created constructs. 2014-07-17 00:40:24 -07:00
Ergovisavi ff17e36750 Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
2014-07-12 20:03:46 -07:00
paprka b92397a2e3 paprikkas gay 2014-07-10 20:12:24 -07:00
Cheridan 961adb8465 Further Hydro Cleanup
Fixes #3880 : Mapped or Adminspawned Growns will take on the default variables of their seed type.
Fixes #3828 : Meteor Pen projectiles are now visible

Some more refactoring, clearing up the growninedible.dm. Deletes hydroitemcode.dm. Keep code with the definitions, ew ew.
2014-07-08 00:22:31 -05:00
Firecage 983ac3ed79 Killer Tomatoes
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-04 16:27:54 +02:00
Francis Devine 2786bcc54b Override emp_act on the ionrifle
A gun isn't much use if it disables itself

fixes #3994
2014-06-24 20:37:27 +12:00
CollenN 2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
Cheridan 5a57cc85c3 Update shotgun.dm
shells spin faster
2014-06-11 19:15:53 -05:00
Cheridan 43f9e78493 Casing rotation
Spent casings ejected from firearms will spin as they 'tumble' towards the ground.
Improved sprites for shotgun shells
Improved sprite for bullet projectile.
2014-06-07 01:23:49 -05:00
Cheridan 3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
Conflicts:
	code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00
Zelacks d79cc315bf Emp Icon fix Commit 2014-05-06 02:55:58 +08:00
Cheridan 460478f11a Merge pull request #3555 from Aranclanos/lasercyborgEMP
Lasers from cyborgs won't get their sprite ruined due to an EMP anymore.
2014-04-28 18:04:24 -05:00
Aranclanos f794a2a1c0 Lasers from cyborgs won't get their sprite ruined due to an EMP anymore. 2014-04-27 17:48:38 -03:00
paprka b9d376a6d5 final stuff 2014-04-26 19:25:56 -07:00
Cheridan 4d8160ab14 meteorhit() is kill 2014-04-22 12:16:02 -05:00
Incoming be8671fcf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.6
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-04-21 19:00:04 -04:00
Incoming c83728bba1 Magic Mania 1.6: Baby's Day Out
*Adds unique sprites for the staves of door creation and chaos
**Item sprites
**Inhands
**Onbacks

*Fixes #3232 in a way that isn't terrible

*Basically this is the part of 1.5 that should have been done back when it was added
*Please raise wizard rates :3
2014-04-17 19:35:42 -04:00
Ergovisavi 896414bcc4 Increased cost of gygax, decreased cost of durand, capped protolathe coeff at 2x 2014-04-16 20:09:54 -07:00
Ergovisavi f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
VistaPOWA bd4156f18c Adds missing newline 2014-04-09 15:08:51 +02:00
VistaPOWA ef5fed5aa0 mergending 2014-04-09 15:07:06 +02:00
VistaPOWA e4e7331399 Adds point-blank shooting
Adds point blank shooting, now you can shoot anyone even if they are on
the same tile or one tile from you. On harm intent, you BUTT-STROKE or
PISTOL WHIP (military terms!!) people with the gun, allowing for not
quite harmful floggings.

Makes gun.dm less shit.
2014-04-09 15:02:33 +02:00
ikarrus f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
Aranclanos b84d47717d Merge pull request #3191 from Steelpoint/LaserChange
Laser Gun Ammo Buff + Sprite Change for Red Laser Tag
2014-03-31 14:02:21 -03:00
Steelpoint fd32b3ebda Removes LaserTagLaser Sprite Change + Reduces Laser Gun Ammo 2014-03-31 15:49:08 +08:00
Aranclanos 7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
Ergovisavi d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Incoming e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic
Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm
2014-03-26 13:03:12 -04:00
Steelpoint 454ebaeb2b LaserGun Change and Other 2014-03-26 20:55:46 +08:00
Incoming 6b83a8d2e0 I am crying.
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue

Conflicts:
	code/game/objects/structures/crates_lockers/closets/statue.dm
	code/modules/mob/living/simple_animal/hostile/statue.dm
	code/modules/projectiles/projectile/magic.dm
	tgstation.dme
2014-03-24 22:13:43 -04:00
Mloc-Hibernia 8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
Incoming bab77f2538 Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue
Conflicts:
	code/modules/projectiles/projectile/magic.dm
2014-03-23 12:08:33 -04:00
MrPerson 6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Incoming c37f7781d6 NPCs statues now respect whoever zapped them to life without removing their ability to destroy everyone else. 2014-03-20 20:19:54 -04:00
Ergovisavi 57fe8ea3f4 Various mineral/material standardizations, minor mob changes 2014-03-19 18:28:56 -07:00
Aranclanos b1a489ac07 Merge pull request #3000 from Cheridan/3000
adds the mime mech
2014-03-10 23:21:34 -02:00
MrPerson 6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Incoming 5c3f7777b9 Magic Mania 1.5: Big Trouble in Little Boxstation
---

A Few New Wizard Items

Staff of Chaos: Shoots random magic bolts. Charges faster and can hold more shots than other staves.
Staff of Door Creation: Works the same as the wand of door creation. There is apparently demand for this! Charges faster and can hold more shots than other staves.
Wand Assortment: A belt that comes of one of each useful wand, generated with the highest number of shots possible.

---

Cleaning Up the Spellbook

The spellbook was getting REALLY long, so it's been segmented into pages for spells, items, and one time use spells (aka the fun page). The spellbook also highlights the fact that you can upgrade spells better now.

---

Summon Magic Rebalancing

There's now a new catagory of magic items that are especially potent. These have a very low chance of showing up now and only one can spawn during a casting of summon magic, if one even spawns at all. The person who gets it is not guarenteed to be a surivor either.

In this category: Staff of Animation, Staff of Change, Staff of Chaos, Wand Assortment, Contract of Apprenticeship.

Additionally the staff of door creation is now in the normal pool and the staff of change is no longer in the normal pool.

---

Misc Stuff

Adds Bats and Goats to the staff of change.
Changes the charge spell so if you charge something that can charge on its own there's no chance of degradation.
2014-03-08 17:30:40 -05:00
Ergovisavi 062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Ergovisavi a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
Cheridan 7ea56ca131 adds the mime mech 2014-03-05 18:06:56 -06:00
MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00