Commit Graph

4458 Commits

Author SHA1 Message Date
Cheridan f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted
Replaced last occurences of gc_destroyed by qdeleted()
2016-03-06 12:29:30 -06:00
tkdrg 2389fd0b01 Merge pull request #15899 from phil235/ResistandGrabFixes
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
KiwiFarms 9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg e0b4569165 Merge pull request #15895 from TehZombehz/firstfashion
Adds green version of the plaid skirt.
2016-03-04 21:34:42 -03:00
phil235 44eb9607e0 Some adjustments to wrapping code. I removed my possibility to wrap non-box storage item (that was at the expense of seeing a warning message that the packagewrap doesn't fit in the storage item every time you wrap one). So we're back to only wrapping boxes.
You can now wrap an item that is in your hand, and wrapping an item puts the created package in you hand.
Also, opening a package puts the item in your hand instead of being dropped on the ground.
2016-03-04 17:24:36 +01:00
phil235 a330cafea5 Fixes some mistakes.
Updating the package wrap's descriptions to be accurate and useful.
2016-03-03 21:02:03 +01:00
phil235 15d8e0a96f I refactored how a mob resisting out of a closet that is itself inside something is done.
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button  work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
KorPhaeron 555d55f39a Typo fix 2016-03-03 12:41:07 -06:00
TehZombehz 943c3e45e0 Comments number updated. 2016-03-03 05:04:04 -06:00
TehZombehz 78ac55d8fb Increases size of clothesmate refill accordingly. 2016-03-03 00:19:23 -06:00
Cheridan 2a6d069b5b Merge pull request #15867 from RemieRichards/monkey_jetpack_fix
Fixes Monkeys not being able to steer jetpacks.
2016-03-03 00:13:00 -06:00
tkdrg 35cf237233 Merge pull request #15875 from PKPenguin321/patch-9
fixes typo with bolas
2016-03-02 22:59:03 -03:00
KorPhaeron 6f051bbccb Span Classes 2016-03-01 20:01:12 -06:00
KorPhaeron 2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2016-03-01 19:18:29 -06:00
tkdrg 74cfbabb48 Merge pull request #15837 from MMMiracles/Whetstone
increases the player skill gap
2016-03-01 21:30:48 -03:00
PKPenguin321 42e82b0746 fixes typo with bolas
byond editor has no spellcheck
2016-03-01 15:39:46 -08:00
tkdrg 41a42922d2 Merge pull request #15709 from Malkevin/cuffsandclean
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
Remie Richards 28a49d127d Fixes Monkeys not being able to steer jetpacks. 2016-03-01 18:00:00 +00:00
KorPhaeron 24e3d569f8 Door remotes 2016-03-01 01:43:12 -06:00
MMMiracles 454928f3cd increases the player skill gap
if you don't know what a whetstone is then maybe you should just git gud
2016-02-29 11:43:21 -05:00
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
malkevin 8a627b9e66 Cuffs and sec clean up
Sometime last year sec officers lost one of the two pairs of cuffs they started with (I think its when the adv taser was added on spawn, cuffs used to be in the armor slot and were replaced by the taser but never placed anywhere else)
Seeing as cuffs are the only thing stopping sec officers beating the clown to death, I'm readding them.

I've also done a general clean up on sec lockers, removing the extra standard headset (why the f weren't these just replaced by the bowmans in the first place?), and stuffed the locker contents into the sec belts - because fuck the RSI inducing clickfest that is gearing up.
Reordered some of the contents of lockers, again for less repetitive clicks.

Gave the HoS a proper stun baton (I've notice most HoS's pinch a spare one from an officer's locker).
Swapped the detectives collapsible baton for a classic baton, seeing as they're as shit as collapsible batons now and fit the detective's film noir look better. Also gave him some pepperspray because its terrible enough for him to use.

:CL: Malkevin
tweak: Sec officers have two sets of cuffs again (one on spawn, one in locker)
tweak: Done some optimisation of sec spawn equipment lists and lockers to remove some of the repetitive clicking, sec belts are now preloaded with equipment.
tweak: HoS has a full baton instead of the collapsible one
tweak: Detective has a classic police baton and pepper spray instead of the collapsible baton (some made police batons shit, so don't get overly happy)
bugfix: pop scaled additional lockers spawned were the wrong type, changed them to the right type which has batons now.
/:CL:
2016-02-23 21:46:59 +00: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