Commit Graph

576 Commits

Author SHA1 Message Date
c0
1dea7ac78b Defines 2016-03-02 00:23:50 +03:00
c0
af5276467b Allows aliens/monkeys to use magic and arm-mounted guns 2016-03-01 23:52:58 +03:00
Jordie
32bf31f3a0 Merge pull request #15707 from Core0verload/breathing_implant
[Ready] New cyberimplant: breathing tube
2016-02-29 14:53:42 +11:00
AnturK
655c6ecf14 Fixes reskinned shotgun sprite reverting when unloading/sawing off. 2016-02-26 22:33:13 +01:00
c0
6c9be9c82d Adds breathing tube implant, changes how heart works, reworks arm-mounted implants 2016-02-25 12:50:45 +03:00
phil235
57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
2016-02-23 19:49:38 +01:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions.
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
Cheridan
b7d4e62100 Merge pull request #15668 from CosmicScientist/fixes_ss
Fixes rechargeable e-gun language
2016-02-22 21:59:45 -06:00
phil235
91839f5f70 Action buttons will now only update when needed instead of every Life().
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
CosmicScientist
b8a62ea54b removes an unnecessary s 2016-02-21 19:28:49 +00:00
KorPhaeron
f0554d432d Excess whitespace removal 2016-02-20 15:22:27 -06:00
KorPhaeron
0acaebb844 Cursed Revolver 2016-02-20 15:20:12 -06:00
tkdrg
29ffc7ef16 Merge pull request #15213 from xxalpha/future
Kinetic accelerators automatically reload.
2016-02-20 09:06:51 -03:00
xxalpha
d0d708fa69 spawns 2016-02-17 14:37:07 +00:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Thunder12345
cac7a6eddf Sprites for APS and nagant 2016-02-13 20:11:58 +00:00
Thunder12345
142bef3304 Oops forgot to make the APS unsuppressable 2016-02-13 20:11:58 +00:00
Thunder12345
b5c79e3781 Adds military russian
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
2016-02-13 20:05:51 +00:00
Thunder12345
b9fcf72e12 Added 9mm stechkin APS, 12 round magazine, 3 round burst fire or semi auto. 2016-02-13 20:05:51 +00:00
Thunder12345
0c81fa7519 Adds a bunch of parent calls to children of /gun/projectile so they can be suppressed correctly. Nagant revolver now properly accepts suppressors. 2016-02-13 20:05:51 +00:00
Thunder12345
f4f227412f Added nagant revolver, and its new ammo type 2016-02-13 20:05:51 +00:00
duncathan salt
a27a0a1e33 Merge pull request #15303 from KorPhaeron/Lesser
Nerfs lesser summon guns
2016-02-10 21:36:30 -06:00
AnturK
9a4bf35bda Merge pull request #15329 from KorPhaeron/instagib3
Fixes instagib EMP act
2016-02-09 22:18:48 +01:00
KorPhaeron
aea7134ab3 Fixes instagib EMP act 2016-02-08 13:56:05 -06:00
GunHog
0bab26452b Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
2016-02-08 08:50:44 -06:00
KorPhaeron
aecf08655d Nerf LSG 2016-02-07 22:41:08 -06:00
tkdrg
22e2f0d81e Merge pull request #15243 from KorPhaeron/laser_rifle_tweaks
Better laser rifle magazine description
2016-02-07 21:18:45 -03:00
KorPhaeron
ce53241cf3 But this time it actually compiles 2016-02-06 14:46:14 -06:00
KorPhaeron
688276008d Updated desc 2016-02-06 14:37:11 -06:00
phil235
99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
tkdrg
f00e9588fd Merge pull request #14992 from KorPhaeron/flashlights
Adds laserguns with rechargeable, swappable magazines
2016-02-06 16:36:03 -03:00
tkdrg
0dbbcce675 Merge pull request #15216 from KorPhaeron/fixes_bulldogs
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
tkdrg
eda3c54d9d Merge pull request #15070 from MMMiracles/instagib
Adds an Instagib Rifle
2016-02-06 08:36:06 -03:00
KorPhaeron
2f6c9ec50e Bulldog Fix 2016-02-05 12:06:53 -06:00
xxalpha
acddd54b36 Kinetic accelerators automatically reload. 2016-02-05 08:02:59 +00:00
tkdrg
058f93a052 Merge pull request #14911 from MMMiracles/L6butbetter
local man rebalances bulldog and SAW, ruins everything
2016-02-04 21:59:28 -03:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
phil235
81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
MMMiracles
58c2972047 made AP rounds actually capable of denting people in bulletproof armor 2016-02-02 18:28:23 -05:00
MMMiracles
64b09f82e5 outlining on rifle is more defined, made a red and blue variant along with a generic variant. 2016-02-02 18:19:22 -05:00
KorPhaeron
b839423c63 Adds fire sound 2016-01-31 18:17:08 -06:00
MMMiracles
ea3e03ec48 adds a blue variant of the rifle for team-based stuff or something 2016-01-30 01:57:14 -05:00
MMMiracles
cb8e000580 adds instagib rifle 2016-01-30 01:24:56 -05:00
KorPhaeron
c8bccbd0a5 Laserguns 2016-01-27 21:14:08 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
MMMiracles
e8186080fb more name changing to fit 2016-01-26 09:49:13 -05:00
MMMiracles
f6407ab136 moist nugget now has its own ammo 2016-01-25 21:54:37 -05:00
MMMiracles
045f2d480b saw and bulldog changes fight me kiddo 1v1 2016-01-25 20:58:38 -05:00
GunHog
e326c70ed9 Nitpick handling 2016-01-24 20:26:16 -06:00