Commit Graph

347 Commits

Author SHA1 Message Date
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
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
4d8160ab14 meteorhit() is kill 2014-04-22 12:16:02 -05:00
ikarrus
f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06: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
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
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
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
Razharas
f259e815d4 Merge pull request #2924 from TZK13/Shotgun-Shells
Incendiary shotgun shells
2014-03-02 13:39:50 -08:00
Incoming
ca917c828f Staff of animated statue fixes and nerfs
Player controlled animated statues that ghost won't start attacking everyone, they'll just stalk people without attacking.

A player controlled animated statue will only last as long as the statue would have lasted,at the end of the time the player is released from the statue as usual, and no longer has any onus to not fuck up the wizard.

NOTE: this means you can't use animate statues to "kill" a target, they'll recover eventually, and even if the round ends before they do, it still won't count.
2014-03-01 23:12:30 -05:00
Ergovisavi
ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
hornygranny
e65dc20971 Electrodes, stun bullets, darts and bolts reduced from 10 to 5 2014-02-27 13:04:58 -08:00
TZK13
9e79d2e4b4 Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites. 2014-02-26 12:05:41 -06:00
MrPerson
9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
Incoming
69ff4041c1 bolts of animation weren't deleting when creating statues at point blank range. 2014-02-21 20:58:38 -05:00
Perakp
965e7ad6d8 Merge to master
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
Perakp
7ca06565b5 Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind
Conflicts (Resolved):
	code/datums/spells/mind_transfer.dm
	code/game/gamemodes/wizard/artefact.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2014-02-14 20:57:11 +02:00
Incoming
5237e46d09 rerebalanced the SoC after running the odds 2014-02-09 13:32:12 -05:00
Incoming
151d637077 Animate statues in magic stuff/Staff of Change rebalance
Adds animate statues to the Staff of Change pool of mobs
Adds specific synergy between flesh to stone and the staff of animation where if you animate your statue'd people they'll turn to animated statues controlled by the victim who are instructed not to dunk the wizard.

Splits the "animal" sub pool in the Staff of Change into "Beast" and "Helpless Animals" to help raise the odds of the former against the latter. Changed odds will be reported in a comment to follow.
2014-02-09 13:20:00 -05:00
Incoming
db5602b34a Adds a chance of syndiborg to the staff of change.
Odds of syndiborg are 5%, odds of normal borg are now 11.666...%, down from 16.666...%

syndiborgs spawn with their default lawset, which means that they can (and almost certainly will) try to kill everyone if left to their own devices
2014-02-05 18:48:06 -05:00
fleure
153aae94e2 Merge pull request #2481 from Tenebrosity/projectileimpactnoises
Adds generic impact noises to all projectiles
2014-02-02 04:24:46 -08:00
Cheridan
00d85c344d Merge pull request #2547 from Ergovisavi/mushroom_hunter
Walking Mushrooms will now hunt and eat eachother
hydroponics best department
2014-02-01 21:14:28 -08:00
fleure
6d8f911023 Merge pull request #2504 from RobRichards1997/25/01/2014-Magicks-bad
Fixes #2503 - Mechs Vs. Wand of death
2014-01-30 10:43:13 -08:00
Ergovisavi
d56f48d241 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten. 2014-01-29 14:56:06 -08:00
Ergovisavi
8906d8a28d Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-29 12:27:26 -08:00
Tenebrosity
84b9a63330 Adds a generic projectile hit sound to most projectiles, except for practice laser and laser tag beams. Scales volume of projectile hit sounds by damage done by the specific projectile.
Overrides the generic sound with specific ones for electrodes and
lasers: sear.ogg for lasers and "sparks" for electrodes.

Thanks @optimumtact for your help with getting the hitsound volume scaling to work.
2014-01-29 19:22:56 +13:00
Robson Richards
704d798152 Removes unnecessary type check from projectiles/projectile/magic.dm death projectile. 2014-01-26 16:37:53 +00:00
Robson Richards
a66f138215 Fixes Mechs dieing to Wand of death
Changes simple_animal/Die() because it disagrees with simple_animal/Life() due to the health variable
2014-01-25 15:50:12 +00:00
Ergovisavi
9fef44c32e Kinetic gun can now break through mining tiles due to the goliath being able to possibly trap you in an unwinnable situation otherwise
More mob behavior vars in hostile animal, added Passtable to hivelord and brood and removed their environment smash
2014-01-22 17:44:32 -08:00
Ergovisavi
9e6cd7fba5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs
Some more AI behavior var tweaks
2014-01-21 22:59:46 -08:00
Ergovisavi
eb8924d80c Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc 2014-01-20 17:36:06 -08:00
Giacomand
1256500ca2 Fixes #2456 by moving the code which transfers the reagents to ready_proj()
Removed excluded obsolete files.
Adds a new option to view variables which allows you to add reagents, useful for debugging reagents.
2014-01-20 14:20:54 +00:00
fleure
89bb6b8547 Merge pull request #2391 from ManeaterMildred/MechUpdate
Mech Update : Gygax, Ion and Carbine
2014-01-17 10:02:39 -08:00
ManeaterMildred
4daac07f20 -Copypasted the old indentation and fixed the bullet path
type because I'm dumb
2014-01-16 23:01:40 +01:00
ManeaterMildred
e24ce7681f Nerfed the incendiary bullets (The Mech Carbine ammo) to only
5 Brute but retain his incendiary effect.
2014-01-16 16:38:46 +01:00
fleure
088e9fb80a Merge pull request #2354 from Incoming5643/slimetime
Slime Mob Refactor
2014-01-16 06:20:03 -08:00
Cheridan
8aaf10feb4 Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets
Gun Revamp 2: Gun Harder: Director's Cut
2014-01-14 11:10:05 -08:00
fleure
074ead1b40 Merge pull request #2345 from hornygranny/weakbullet
Weakbullet damage change
2014-01-14 10:41:34 -08:00
Incoming
305cb2ac9d Jenkins you're a loose cannon, but you're a damn good cop. 2014-01-13 20:02:54 -05:00
sirbayer
eb20908dcf Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets 2014-01-13 14:08:57 -08:00
Hornygranny
3c52f26750 extra line removed 2014-01-13 11:11:06 -08:00
Hornygranny
775728e20e Beanbag damage lowered. .38 damage increased. 2014-01-13 11:08:19 -08:00
Hornygranny
ee072e6e55 Changed neurotoxin from a child of energy to a child of bullet 2014-01-10 12:16:00 -08:00