Commit Graph

7148 Commits

Author SHA1 Message Date
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
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
tkdrg
a0397a73a7 Merge pull request #15698 from LanCartwright/flyvomit
Flypeople now eat vomit
2016-03-01 21:30:15 -03:00
tkdrg
e816f3c305 Merge pull request #15834 from Impisi/MaintMRLoot
Adds Modular Receivers to the maint loot spawning table
2016-03-01 21:04:36 -03:00
Akke
fc88b4d589 changes destroy() to qdel(src) 2016-03-02 00:00:54 +00:00
tkdrg
41a42922d2 Merge pull request #15709 from Malkevin/cuffsandclean
Cuffs and sec clean up
2016-03-01 20:28:56 -03: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
Impisi
1aadc83f28 I added Modular Receivers with a rarity value of 1 to the loot table for maintenance loot spawning. 2016-02-29 02:31:26 -08: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
tkdrg
9716d1f861 Merge pull request #15787 from KazeEspada/treefixes
Tree Fixes
2016-02-28 21:13:48 -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
KazeEspada
81f60f84f0 fixed an edgecase where you could spam cut a tree and receive multiple logs. 2016-02-26 23:46:09 -07: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
Cheridan
2dfebaa77e Merge pull request #15708 from KorPhaeron/sins
Five lavaland ruins
2016-02-26 08:46:32 -06:00
Cheridan
d80756ce9e Merge pull request #15745 from KazeEspada/TreeCutting
Tree cutting
2016-02-26 08:40:29 -06:00
Cheridan
2d9619446f Merge pull request #15733 from phil235/ClosetAIFix
The AI's core no longer fits inside regular closets
2016-02-26 08:37:57 -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
tkdrg
ee42b2d051 Merge pull request #15652 from lordpidey/wallbuildfix
Fixes inability to construct walls with shuttlemetal
2016-02-25 15:29:58 -03:00
Menshin
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
KazeEspada
8aeb2678e0 You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts. 2016-02-24 23:15:19 -07: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
phil235
3ea7cf9831 The AI's core no longer fits inside regular closets (but still fits inside bluespace bodybag).
Ghosts and camera mobs no longer get inserted inside closets.
Fixes an error in alien nest code.
2016-02-24 22:56:54 +01:00
KorPhaeron
62ce96e20e Adjacency checks 2016-02-24 13:20:12 -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
KazeEspada
cd4b5c17ea Tree Cutting. Implements stump sprites. Work in progress on cutting. 2016-02-23 13:57:10 -07: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