Commit Graph

478 Commits

Author SHA1 Message Date
Cheridan
dff14aa0f9 Merge pull request #13563 from RemieRichards/snipper_wiffle
Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink.
2015-12-12 23:55:55 -06:00
Cheridan
0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
Remie Richards
36d2f54c69 Zooming is now a /gun level ability, enable-able at gun creation via a "zoomable" var, Zooming can be properly enabled externally by calling the build_zooming() proc on any gun. 2015-12-12 15:26:17 +00:00
Remie Richards
a49fdc0cc7 Allows the sniper rifle to be suppressed and unsuppressed. 2015-12-11 15:22:47 +00:00
Remie Richards
3b1afe46f2 Reallows Noscopes, Losing the weapon/Being stunned/Dying correctly unzooms you. 2015-12-11 15:10:09 +00:00
Jordie
d7e7ef9280 Update energy.dm 2015-12-11 16:25:16 +11:00
Jordie0608
7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
2015-12-11 15:59:46 +11:00
Remie Richards
bc561789c2 Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink. 2015-12-11 01:30:14 +00:00
bgobandit
01dd491390 Fixes various mining bugs. Adjusts gear costs. 2015-12-10 14:43:33 -05:00
Cheridan
76b71469ea Merge pull request #13308 from swankcookie/autorifle_fix
Changes ammo type in autorifle desc
2015-11-29 23:30:14 -06:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
swankcookie
225ce9e555 what do i look like? spellcheck? 2015-11-29 02:27:05 -06:00
swankcookie
fe35576c63 changes round type in desc 2015-11-29 00:15:37 -06:00
Remie Richards
fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
Cheridan
762568255d Merge pull request #13102 from bgobandit/newmininggear
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
MMMiracles
2d94b0ff9b feedback changes:
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -05:00
bgobandit
f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
Jordie0608
9198120ee8 unifies energy gun self charging 2015-11-22 17:37:26 +11:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
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
YotaXP
2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05: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
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
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
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
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
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
Xhuis
66f67946ae Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-21 22:18:24 -04:00
c0
93fb95993e Instant merge is the fastest action type for this operation 2015-09-22 00:20:36 +03:00
c0
ef8bb5e0e0 Russian roulette 2015-09-22 00:20:36 +03:00
Jordie0608
1d9c61702d Merge branch 'master' of https://github.com/tgstation/-tg-station into bagsofholdingsarejustincompletesingularitygrenades
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
2015-09-21 17:00:08 +10:00
Aranclanos
6e117f031e Merge pull request #11837 from Steelpoint/GunSprites
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
Steelpoint
2f9a37d624 Changes 2015-09-21 10:21:10 +08:00
Swag McYolosteinen
1a5df1d08b Merge pull request #11846 from GunHog/RadsPlzKThxLol
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02:00
Remie Richards
225eee3d2f Merge pull request #11815 from spasticVerbalizer/shootFooting
Makes clumsy misfires actually target a leg
2015-09-20 17:24:24 +01:00
Maarten van den Berg
f3f080693a Adds zone_override var to process_fire and friends, updates clumsy and gun suicide 2015-09-20 16:52:39 +02:00
Xhuis
76b90ef25c Adds a variable, can_unsuppress 2015-09-19 14:25:16 -04:00
Xhuis
f53897523c Conflicts 2/3 2015-09-19 14:07:24 -04:00