ca462c0dbc
Merge pull request #15742 from PKPenguin321/emp-kit-buff
...
Buffs the EMP kit
2016-02-26 09:20:39 -06:00
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
2dfebaa77e
Merge pull request #15708 from KorPhaeron/sins
...
Five lavaland ruins
2016-02-26 08:46:32 -06:00
d80756ce9e
Merge pull request #15745 from KazeEspada/TreeCutting
...
Tree cutting
2016-02-26 08:40:29 -06:00
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
86c72e845b
Merge pull request #15741 from PKPenguin321/patch-18
...
sharpening blocks hotfix
2016-02-25 20:08:45 -05:00
ee42b2d051
Merge pull request #15652 from lordpidey/wallbuildfix
...
Fixes inability to construct walls with shuttlemetal
2016-02-25 15:29:58 -03:00
KiwiFarms
8c41e37d3e
* RPD now starts in pipe building mode
...
* Removed unused var
2016-02-25 13:51:11 +01:00
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
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
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
04b4955c2e
better fix for sharpness override part
...
thanks kaze
2016-02-24 18:20:46 -08:00
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
26731ee94e
Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
...
Adds sharpening blocks
2016-02-24 19:49:40 -06:00
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
62ce96e20e
Adjacency checks
2016-02-24 13:20:12 -06:00
e9a347289b
Merge pull request #15681 from PKPenguin321/patch-13
...
Tweaks stun/teleprod tablecrafting recipes
2016-02-24 14:47:31 +03:00
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
2a2b9fa82d
removes some now-useless code
...
by phil's request
2016-02-23 16:59:58 -08:00
cd4b5c17ea
Tree Cutting. Implements stump sprites. Work in progress on cutting.
2016-02-23 13:57:10 -07:00
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
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
d17d34edc9
Three lavaland ruins
2016-02-23 01:07:06 -06:00
b81d8acda9
Update items.dm
2016-02-22 19:48:18 -08:00
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
04bf8d8651
Merge pull request #15670 from optimumtact/defibsonlystopheartattacks
...
Nerf the defib heavily
2016-02-22 16:20:06 -06:00
09252b4f4b
Merge pull request #15657 from KorPhaeron/abductor
...
Abductor Airlocks
2016-02-22 00:05:15 -06:00
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
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
583c2c3dea
Fixes
2016-02-21 15:46:16 -08:00
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
54e14878b1
Nerf the defib heavily
2016-02-22 10:10:32 +13:00
5daae812f7
Chameleon PDA, fixes
2016-02-21 12:04:38 -08:00
2f688f2b64
Merge pull request #15635 from KazeEspada/barfights2
...
Bar Fights 2
2016-02-21 19:36:33 +01:00
ac7aed2cb7
Removes parentheses
...
Really? Really?
2016-02-21 10:56:57 -07:00
50bbd40ff4
Merge pull request #15641 from kingofkosmos/toiletgrammarfix
...
Urinal message span fix
2016-02-21 09:41:10 -03:00
89f07f0ab3
Chameleon Kit
2016-02-21 01:11:17 -08:00
5d5d2427f4
temp
2016-02-20 22:12:25 -08:00
3f439b211c
Abductor Airlocks
2016-02-21 00:01:54 -06:00
97feffe43c
Removes compile error
2016-02-20 22:07:02 -05:00
d3472dd45e
Minor refactor to girder code.
2016-02-20 22:04:46 -05:00
b4b3d5bc27
Fixes #15621
2016-02-20 21:50:59 -05:00
9a33d27e05
Wooden chairs added. Inhands in WJohnston's pull. Fixed an issue with spawning to many sheets upon smashing.
2016-02-20 14:25:29 -07:00
1485297a64
Fixes dme, can't store knife
2016-02-20 14:57:06 -06:00
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
f81e52c164
Merge pull request #15605 from phil235/StreamSpray
...
Spray bottles now have a "stream" mode toggled by clicking the bottle.
2016-02-20 11:56:33 -03:00
63a6021aa7
Changes a toilet attack message span and changes few instances where using "you" is possible.
...
Fixes #15637
2016-02-20 15:53:30 +02:00
116cf0ba77
forgot to commit a file
2016-02-19 22:44:23 -07:00
40ca05b70d
Enhances barfights by making chairs smash against people. If they are weak enough, the act of smashing will knock them on their ass.
...
Also some backend stuff to make chairs more readable.
2016-02-19 22:15:37 -07:00
c576c42e06
Merge pull request #15619 from KazeEspada/chairfixes
...
Chair Fixes.
2016-02-19 22:57:52 -05:00
Cheridan
Joan Lung
tkdrg
KiwiFarms
KazeEspada
PKPenguin321
phil235
KorPhaeron
Razharas
AndrewJacksonThe2nd
oranges
AnturK
Mike Long
kingofkosmos