Commit Graph

315 Commits

Author SHA1 Message Date
Aranclanos b1a489ac07 Merge pull request #3000 from Cheridan/3000
adds the mime mech
2014-03-10 23:21:34 -02: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
Razharas f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
Razharas f259e815d4 Merge pull request #2924 from TZK13/Shotgun-Shells
Incendiary shotgun shells
2014-03-02 13:39:50 -08:00
Razharas 263e2abec6 Merge pull request #2885 from AlexanderUlanH/idedplsnerf
Rebalanced EMP's against mobs
2014-03-02 13:26:38 -08: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
Razharas 2fd5557682 Conflict fix 2014-03-02 04:14:32 +04: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
AlexanderUlanH a3dd6c4dda Consistentification
Sticking with the high-end of damage, for lack of strong opinions.  Also
removed false claims of certain procs' being in human_defense.dm, and a
useless emp_act override in ion rifles. (All EMP's are 1 or 2 severity)
2014-02-25 10:04:49 -05:00
Razharas ba54bd940b Conflict fix 2014-02-24 22:12:02 +04:00
Razharas b27d9c7396 Added RPED, some sprites and new power cell path
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
Incoming 69ff4041c1 bolts of animation weren't deleting when creating statues at point blank range. 2014-02-21 20:58:38 -05:00
Razharas 5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range
throw_range pass
2014-02-18 16:17:13 -08:00
Perakp 965e7ad6d8 Merge to master
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
Razharas ea7318985d Merge pull request #2714 from Ergovisavi/asteroid_overhaul
[MAP] Asteroid/Mining Overhaul
2014-02-17 16:44:46 -08:00
Hornygranny 2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Aranclanos b78c7eca06 Merge pull request #2809 from hornygranny/throwspeed
throwspeed pass
2014-02-17 06:26:06 -02:00
Ergovisavi 1749d38d56 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
2014-02-16 19:36:48 -08:00
Razharas f31654b499 Merge pull request #2700 from Incoming5643/statuesarecool
Animate statues in magic stuff/Staff of Change rebalance
2014-02-16 00:38:47 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08: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
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Ergovisavi 892ffd3879 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 2014-02-09 22:37:20 -08: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
Razharas 001943460c Merge pull request #2653 from Incoming5643/syndiborgchance
Adds a chance of syndiborg to the staff of change
2014-02-08 04:15:46 -08:00
Ergovisavi 62ede5d1ae Merging the Asteroid Map overhaul and Mining Equipment/Locker into one pull, added Mining Scanner, changed mesons
Tweaks on how caves are spawned and how mobs are spawned on the asteroid
2014-02-07 00:18:45 -08:00
Tenebrosity 2b978e5da7 Fixes merge conflicts and removes excess message 2014-02-06 20:30:43 +13:00
MrPerson 41d1189156 Emergency fix for a projectile runtime
Emitters (and probably turrets) never clicked anything so this var is null. Starting the singulo = emitter shots never move and runtime constantly.
2014-02-05 21:28:54 -08: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
MrPerson 931da9e7ef Many changes
Much diff
2014-02-04 22:49:38 -08:00
Razharas 061b6aab4a Merge pull request #2607 from adrix89/Fix_1653
Fix 1653
2014-02-04 17:40:30 -08:00
Razharas 43a5b6a605 Merge pull request #2583 from Incoming5643/bugfixenfeb
Various Bugfixes
2014-02-03 22:05:18 -08:00
adrix89 c1ae410869 Fixes 1653
Projectiles now have a layer threshold 2.75 which is the spiderlings layer.
2014-02-03 17:15:49 +02:00
Cheridan 04c1af2c16 Merge pull request #2577 from hornygranny/mobster
Mobster items + shirt
he paid me off with a bugfix forgive me
2014-02-02 21:45:42 -08: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
Ergovisavi a270bb5696 Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
2014-02-01 17:11:21 -08:00
Hornygranny 0bc85a4f9e removed \improper from tommy gun 2014-02-01 13:55:46 -08:00
Incoming 45cf5ec20c Various Bugfixes
Fixes #2534
Fixes #2431
Fixes #2493
Fixes #2500
2014-02-01 11:29:37 -05:00
Hornygranny ec7eb2f550 Fedora message uses visible_message
Sprites from Nienhaus
2014-02-01 02:22:40 -08:00
hornygranny 3e07065631 mag name fixed 2014-01-31 16:22:49 -08:00
hornygranny e133206824 one character pr 2014-01-31 16:16:41 -08:00
hornygranny c569654ebc Mobster items + shirt 2014-01-31 15:50:09 -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