Commit Graph

1131 Commits

Author SHA1 Message Date
Cheridan
d51a1907f8 Merge pull request #15750 from Steelpoint/M90
C20r Buff | M90 Removal
2016-02-27 00:22:01 -06:00
Steelpoint
628be2f67d C20rChange 2016-02-25 15:54:37 +08: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
tkdrg
2f17bc0e2d Merge pull request #15645 from KorPhaeron/darby
Cursed Russian Revolver
2016-02-22 14:47:08 -03:00
tkdrg
3ad21db02f Merge pull request #15647 from Boredone/master
Fixs Breach Slugs Magazines
2016-02-21 22:16:34 -03: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
Boredone
40005aca32 Hope I didn't mess up here as I didn't branch off earlier changes. 2016-02-20 15:34:01 -07:00
tkdrg
001b575898 Merge pull request #15151 from CPTANT/laserfire
Laser beams may now set you on fire
2016-02-20 19:19:22 -03: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
CPTANT
5f92894e70 removes firestacking 2016-02-20 16:47:39 +01:00
tkdrg
29ffc7ef16 Merge pull request #15213 from xxalpha/future
Kinetic accelerators automatically reload.
2016-02-20 09:06:51 -03:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
xxalpha
d0d708fa69 spawns 2016-02-17 14:37:07 +00:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
phil235
2dd476f13e Fixes shaking someone resting not making them stand up.
Fixes shaking someone not reducing the sleeping var if the mob asleep is buckled to stand up.
Fixes merge conflict issues.
Fixes my revive code leaving the revived AI blind.
2016-02-17 01:23:36 +01:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01: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
CPTANT
086dd558f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire
# Conflicts:
#	code/game/gamemodes/malfunction/Malf_Modules.dm
2016-02-16 03:23:55 +01:00
phil235
e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing)
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
2016-02-14 15:26:46 +01:00
Thunder12345
1861e65bdd Stechkin buff 2016-02-13 20:11:58 +00:00
Thunder12345
7b6c6b3356 Added 7.62x38mmR ammo box with 14 rounds 2016-02-13 20:11:58 +00: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
phil235
a0855f2693 Brains can no longer be blinded, even when inside a MMI.
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
2016-02-12 02:04:14 +01:00
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