Commit Graph

4432 Commits

Author SHA1 Message Date
Jordie 897aecadf5 Merge pull request #15780 from PKPenguin321/bolas
Adds bolas
2016-02-29 15:01:42 +11:00
Jordie 32bf31f3a0 Merge pull request #15707 from Core0verload/breathing_implant
[Ready] New cyberimplant: breathing tube
2016-02-29 14:53:42 +11:00
tkdrg bc5c023883 Merge pull request #15809 from bgobandit/bettercontraband
Makes contraband crates great again.
2016-02-28 23:13:55 -03:00
bgobandit 5127ba71fc reverts name change, tweaks cost 2016-02-28 11:01:30 -05:00
bgobandit 6b5379f053 Adds items to contraband crate. 2016-02-27 20:14:16 -05:00
tkdrg 77b7f02bdd Merge pull request #15775 from AnturK/fix1
Bunch of fixes
2016-02-27 21:27:08 -03:00
Joan Lung 4530b586fb Merge pull request #15767 from Core0verload/pda_types_separation
PDA subtypes are moved from PDA.dm to PDA_types.dm
2016-02-27 19:17:36 -05:00
PKPenguin321 2932b14256 fixes grammar/nullspace error 2016-02-26 19:59:45 -08:00
PKPenguin321 d9a214e931 adds bolas
adds the item itself and a hand-crafting method to handcuffs.dm
adds a tablecrafting recipe to recipes.dm
adds the sprite to items.dmi
2016-02-26 17:59:55 -08:00
AnturK 59774fc0fb Fixes some other ghost interaction issues. 2016-02-26 23:13:13 +01:00
AnturK c3fd11dc54 Adds cancel button to teleporation scroll 2016-02-26 22:33:12 +01:00
Cheridan ca462c0dbc Merge pull request #15742 from PKPenguin321/emp-kit-buff
Buffs the EMP kit
2016-02-26 09:20:39 -06:00
Cheridan 9e5392b94b Merge pull request #15753 from Menshin/rpd_invisipipe_fix
Makes RPD starts on pipe building mode
2016-02-26 08:52:06 -06:00
c0 6e4d3c05a0 fix 2016-02-26 08:44:08 +03:00
c0 eb7cad946a PDA subtypes are moved from PDA.dm to PDA_types.dm 2016-02-26 06:08:39 +03:00
Joan Lung 86c72e845b Merge pull request #15741 from PKPenguin321/patch-18
sharpening blocks hotfix
2016-02-25 20:08:45 -05:00
KiwiFarms 8c41e37d3e * RPD now starts in pipe building mode
* Removed unused var
2016-02-25 13:51:11 +01:00
c0 6c9be9c82d Adds breathing tube implant, changes how heart works, reworks arm-mounted implants 2016-02-25 12:50:45 +03:00
PKPenguin321 28795e2a28 buffs emp kit
implant has 3 uses up from 2
5 EMP grenades up from 2
2016-02-24 20:38:10 -08:00
Joan Lung 80c9101892 Merge pull request #15661 from AndrewJacksonThe2nd/PARANOIA
A TEAM OF NUKEOPS DISGUISED AS THE HEADS OF STAFF
2016-02-24 23:25:17 -05:00
PKPenguin321 04b4955c2e better fix for sharpness override part
thanks kaze
2016-02-24 18:20:46 -08:00
PKPenguin321 cf29fdd8e1 sharpening blocks hotfix
makes things that are IS_SHARP_ACCURATE sharpenable, as well as things that are just IS_SHARP
makes sharpness not change unless it's a super-sharpening block
2016-02-24 18:15:13 -08:00
Cheridan 26731ee94e Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
Adds sharpening blocks
2016-02-24 19:49:40 -06:00
Razharas e9a347289b Merge pull request #15681 from PKPenguin321/patch-13
Tweaks stun/teleprod tablecrafting recipes
2016-02-24 14:47:31 +03:00
AndrewJacksonThe2nd 38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
PKPenguin321 2a2b9fa82d removes some now-useless code
by phil's request
2016-02-23 16:59:58 -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
PKPenguin321 80dbb567b4 rework
sharpening blocks can now only sharpen items that are already sharp, like knives, axes, etc. (super sharpening blocks don't care though)
max damage from sharpening is now 30 (no esword/ninja sword sharpening), increment is still 4 though
!!items can only be sharpened once!!
twohanded items (fire axes, spears) have their force when wielded increased rather than normal force increasing
2016-02-22 16:59:04 -08:00
Cheridan 04bf8d8651 Merge pull request #15670 from optimumtact/defibsonlystopheartattacks
Nerf the defib heavily
2016-02-22 16:20:06 -06:00
phil235 54db9ded4d Moved janitorial sign in a new weapons/miscellaneous.dm
Made holosign_creator/afterattack() a bit better.
Fixed merge conflict fixing error.
Fixes typos in holosign_creator.dm
2016-02-22 01:44:53 +01:00
phil235 2ec892a1fc Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier
Conflicts:
	icons/effects/effects.dmi
2016-02-22 01:34:20 +01:00
AndrewJacksonThe2nd 583c2c3dea Fixes 2016-02-21 15:46:16 -08: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
oranges 54e14878b1 Nerf the defib heavily 2016-02-22 10:10:32 +13:00
AndrewJacksonThe2nd 5daae812f7 Chameleon PDA, fixes 2016-02-21 12:04:38 -08:00
AndrewJacksonThe2nd 89f07f0ab3 Chameleon Kit 2016-02-21 01:11:17 -08:00
AndrewJacksonThe2nd 5d5d2427f4 temp 2016-02-20 22:12:25 -08:00
KorPhaeron 1485297a64 Fixes dme, can't store knife 2016-02-20 14:57:06 -06:00
KorPhaeron 83ec0ed002 Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2016-02-20 14:49:30 -06:00
phil235 61666cca3a Forgot to handle damage from thrown weapons. 2016-02-19 03:05:50 +01:00
KorPhaeron 1ec9f757cc Merge pull request #15591 from Lobachevskiy/telebaton-fix
Fix police and telebatons ignoring shields
2016-02-18 19:49:54 -06:00
phil235 8b2708ff9a Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator). 2016-02-19 02:34:57 +01:00
AnturK 56d2a34201 Splits beds and chairs
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
KorPhaeron 633cb4d1a3 Bo staff fix 2016-02-17 23:05:25 -06:00
KorPhaeron 9992a7cc7d Tribal Knife 2016-02-17 22:37:23 -06:00
KorPhaeron 0d8a181ee7 Knife 2016-02-17 22:33:33 -06:00
Cheridan cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
Cheridan bb00bd311f Merge pull request #15513 from KorPhaeron/chaplain3
Four more holy weapons
2016-02-17 19:48:06 -06:00
Lo6a4evskiy 43207c3070 Fix police and telebatons ignoring shields 2016-02-18 02:57:32 +04:00