Commit Graph

1095 Commits

Author SHA1 Message Date
duncathan salt
a27a0a1e33 Merge pull request #15303 from KorPhaeron/Lesser
Nerfs lesser summon guns
2016-02-10 21:36:30 -06:00
tkdrg
0c0f4e9006 Merge pull request #15148 from KazeEspada/gunfixes2theelectricboogaloo
Fixes issue #15131. Guns will now fire point blank correctly.
2016-02-10 01:27:34 -03:00
AnturK
9a4bf35bda Merge pull request #15329 from KorPhaeron/instagib3
Fixes instagib EMP act
2016-02-09 22:18:48 +01:00
KazeEspada
6cabed1641 updates code to match new selecting. 2016-02-09 13:51:53 -07:00
KazeEspada
7afa8a625d Merge branch 'master' of https://github.com/tgstation/-tg-station into Gunfixeselecticboogaloo 2016-02-09 13:44:18 -07: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
KazeEspada
b75bea58b1 *click* 2016-02-06 11:15:47 -07: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
tkdrg
70a69ae1e7 Merge pull request #15141 from KorPhaeron/practice
Makes practice lasers scarier
2016-02-05 00:58:16 -03:00
KorPhaeron
7ed46468f5 preserves name 2016-02-04 19:41:12 -06: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
3679f054b2 bumping on up 2016-02-02 18:35:26 -05: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
KazeEspada
91733e03e3 Fixes issue #15131. Guns will now fire point blank correctly. 2016-02-01 21:22:36 -07:00
KorPhaeron
8e9a2e7cb7 Makes practice lasers scarier 2016-02-01 17:46:21 -06: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
KazeEspada
fd8e1b5567 Refactor's gun firing. 2016-01-29 22:16:35 -07:00
KazeEspada
d18b510db5 Merge branch 'master' of https://github.com/tgstation/-tg-station into GunHotFix 2016-01-28 20:06:35 -07:00
KazeEspada
a92fc67631 Fixes an unreported issue with guns that allowed them to fire even if failing can_shoot(). Fixes the ability for clumsy xeno, hulks trained in the ways of the sleeping carp to still shoot themselves in the foot with an abductor gun. 2016-01-28 19:56:44 -07:00
KorPhaeron
c8bccbd0a5 Laserguns 2016-01-27 21:14:08 -06:00
Firecage
d034a3f8ab Compile fix 2016-01-27 13:30:46 +02: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
GunHog
626db2832b Exosuit Medical Beamgun
Adds the Exosuit Medical Beamgun!
- Odysseus version of the Medical Beamgun
- Medical mech equipment is now under /medical/ to prevent copypaste
2016-01-24 17:38:14 -06:00
KazeEspada
17fe36ebda Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 15:14:00 -07:00
KazeEspada
b774041648 Lizards now hunt and kill insects, they swallow them whole.
"We vorestation now." -Iamgoofball.
2016-01-24 15:13:46 -07:00
duncathan salt
0d5885a1f0 Merge pull request #14819 from KorPhaeron/polymorph
Polymorph Fixes
2016-01-24 13:08:11 -06:00
AnturK
229724a6e7 Fixes medbeam pass flags 2016-01-24 12:56:02 +01:00
KorPhaeron
f76d8567c7 Polymorph 2016-01-23 13:03:21 -06:00
Firecage
d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00