Commit Graph

1095 Commits

Author SHA1 Message Date
bgobandit
899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
kingofkosmos
50b55e54e8 Removes checks for seclite/hydrid taser + suppressor/gun to be in hands for combining them. 2015-11-18 06:24:23 +02:00
AnturK
b1bf6acab0 Changes spellbook description
Picks types from list
2015-11-17 15:17:46 +01:00
Razharas
822d085f6a Merge pull request #13044 from KorPhaeron/curvethebullet
Stops projectiles being blown away by spacewind
2015-11-17 06:06:25 +03:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
AnturK
05ff5552b2 Makes staff of doors create random mineral doors. 2015-11-16 21:10:34 +01:00
KorPhaeron
ff7b7535e8 Spacewind fix 2015-11-15 19:35:19 -06:00
phil235
e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun.
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
2015-11-12 19:45:50 +01:00
Cheridan
44cca62727 Merge pull request #12805 from KorPhaeron/xray
Xray range tweak
2015-11-10 18:14:47 -06:00
YotaXP
2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
KorPhaeron
015c480e8f Lasertag beams 2015-11-01 20:55:46 -06:00
KorPhaeron
2484266f0b Xray range 2015-11-01 16:53:57 -06:00
Firecage
cc3912bf37 Makes the decloner once more do cloneloss damage 2015-10-28 01:04:04 +02:00
Cheridan
10b82ee45b Merge pull request #12304 from Incoming5643/utility_aint_gonna_cut_it
Adding Charge and Staff of Healing to the spellbook + category reshuffle
2015-10-25 05:23:03 -05:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
KorPhaeron
520fedd2cf Changed a few gun names 2015-10-22 18:52:40 +02:00
phil235
21c4552576 Merge pull request #12487 from bgobandit/humanoids
Changes the text human ==> humanoid where applicable.
2015-10-22 00:41:19 +02:00
phil235
d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
Razharas
d1df0bfeff Merge pull request #12485 from xxalpha/ultrarange
Added ultra_range() proc.
2015-10-20 00:17:09 +03:00
Cheridan
56b7a7717b Merge pull request #12416 from KorPhaeron/drones
Staff of Change now makes hacked drones
2015-10-19 14:38:16 -05:00
xxalpha
e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
bgobandit
055427b65c human ==> humanoid where applicable 2015-10-18 13:50:34 -04:00
Cheridan
cb7642b969 Merge pull request #12417 from phil235/SmokeChange
Changes smoke to behave more like foam.
2015-10-17 10:07:04 -05:00
Razharas
52a82ff165 Merge pull request #12396 from Steelpoint/RiflesMan
Auto Rifle Balance Changes
2015-10-16 20:07:46 +03:00
phil235
47909d525f Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.
Also smoke reaction now uses the TOUCH method instead of VAPOR, to differentiate smoke and foam. Mob without internals or gas masks also ingests reagents in the smoke.
Moved nanofrost smoke code to effects/effect_system/effects_smoke.dm
2015-10-15 21:52:37 +02:00
KorPhaeron
1aa9ed34e7 Staff of Change 2015-10-15 14:46:01 -05:00
Steelpoint
0070b9911d InitalCommit 2015-10-15 01:51:54 +08:00
phil235
9c3d5ae3c7 Fixes runtimes with augmented_eyesight refund, atom/movable/Bump(), fleshmend, spraycans, PDA messaging, remove_from_storage(), and gun burstfiring. 2015-10-11 17:18:31 +02:00
Incoming
d7713f21b9 The Staff of Healing is now selectable for a cost of 1 in the spellbook
The spell "Charge" is now selectable for a cost of 2 in the spellbook

The spellbook's category system has been reworked to help deal with the huge scroll bars it previously had and help identify to wizards what needs spells and items serve.

The new categories are:

Offensive:
Fireball
Disintegrate
Blind
Mutate
Flesh to Stone
Lightning Bolt
Curse of the Barnyard
Staff of Change
Staff of Chaos

Defensive:
Magic Missile
Disable Tech
Repulse
Stop Time
Smoke
Forcewall
Bind Soul
Staff of Healing
Scrying Orb
Wand Assortment
Armor Set

Mobility:
Mind Transfer
Blink
Teleport
Ethereal Jaunt
Knock
Staff of Door Creation

Assistance:
Instant Summons
Charge
Staff of Animation
Soul Stone Shards + Artificer
Necromantic Stone
Apprentice Contract
Bottle of Blood

Fixes an unreported bug where targeting your mouth with a staff of healing allowed self healing through suicide.

Adds an easter egg to clever wizards who try to charge the spellbook to get more charges.
2015-10-10 20:35:51 -04:00
Razharas
5baaf06fce Merge pull request #12225 from phil235/BugFixBoogalooC
Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
2015-10-09 12:42:17 +03:00
Razharas
87f2cbf4ed Merge pull request #12218 from phil235/BugFixBoogalooA
Fixes critical bug causing multiple hits from single projectile.
2015-10-09 12:41:08 +03:00
phil235
832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
2015-10-08 01:26:55 +02:00
Razharas
92523c03f2 Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo
Sleeping Carp changes
2015-10-07 22:25:11 +03:00
phil235
dbaba791f3 Fixes critical bug causing multiple hits from single projectile.
Fixes some other potential issues coming from changing a few del() to qdel().
Fixes not being able to shoot mob on same tile as the shooter.
Fixes being able to shoot oneself by simply clicking our mob.
Fixes not being able to shoot non human mobs right next to us.
2015-10-07 20:57:36 +02:00
Xhuis
908514c1b3 Some more changes 2015-10-04 12:52:55 -04:00
duncathan
4475824890 fixes #12143 2015-10-04 07:33:32 -06:00
Xhuis
427700dfa5 Fixes projectile blocking 2015-10-04 01:17:22 -04:00
Xhuis
1211ec4102 Some gang stuff 2015-10-04 00:26:26 -04:00
Razharas
56e1d319c8 Merge pull request #12048 from Incoming5643/faithbemyshield
Makes magic bolts properly unblockable
2015-09-30 23:12:02 +03:00
Razharas
1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
Aranclanos
ba07442a69 Merge pull request #12028 from phil235/AddbloodRuntimeFix
Fixes some runtimes, syndiborg module and  grenade launcher
2015-09-28 06:36:54 -03:00
Incoming
067d59669e Makes magic bolts properly unblockable. Their effects still happened even if they were blocked so this really just amounts to removing a false hope message.
Fixes #12046
2015-09-27 15:21:40 -04:00
Xhuis
5f99b313cc Radiation changes 2015-09-26 13:33:27 -04:00
phil235
1d56ff80dc Fixes runtimes with add_blood() and add_blood_list()
Fixes formatting in the mech control console window.
Fixes runtimes when building an AI (mind transfer from mmi to ai was called before the AI's hud_list was set)
Fixes syndicate cyborg not starting with the correct module.
Fixes syndiborg not being able to use their grenade launcher
Fixes runtime with gun process_fire() (some code was reverted by accident)
Fixes a runtime with hostile simple animal's PickTarget().
2015-09-26 13:21:20 +02:00
c0
a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
xxalpha
22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas
f8e2f721c3 Merge pull request #11877 from Core0verload/suicide
Russian roulette: "Spin the chamber" edition.
2015-09-24 01:44:12 +03:00
Razharas
78e9fe068f Merge pull request #11782 from Jordie0608/bagsofholdingsarejustincompletesingularitygrenades
Rework of adv egun failure mechanic
2015-09-24 01:34:38 +03:00