Commit Graph
134 Commits
Author SHA1 Message Date
AnewbeandGitHub 5fffb9d51f Merge pull request #4378 from Neerti/12/1/2017_reaching_weapons
Adds Reach Variable to Weapons
2017-12-02 12:00:26 -06:00
LayneandAnewbe 3f21df1ae2 Fixy fixy. (#4314) 2017-12-01 16:18:20 -06:00
Neerti 5796b14220 Adds Reach Variable to Weapons
Melee weapons can now potentially attack from farther away.
Obstacles are taken into account, so you cannot hit people through windows, but you can attack over specific things such as tables, or other people.
Currently only the spear can do this, with a range of two tiles, however the attack speed for the spear was reduced, so it may remain a situational weapon.
The intention for this is to make specific weapons feel different to each other besides 'does more damage', and I got ideas on other kinds of weapon adjustments later to make them feel a bit more unique.
2017-12-01 12:42:40 -05:00
Neerti af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti 8ac2100fa2 Adds Exploration Equipment
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
Anewbe 1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Anewbe dffb3a6fef Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe
# Conflicts:
#	icons/obj/weapons.dmi
2017-09-28 16:07:45 -05:00
Anewbe 7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Anewbe eed312a8fb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone
# Conflicts:
#	icons/obj/structures.dmi
2017-09-27 13:49:56 -05:00
Anewbe 47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Anewbe 280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Belsima eb341aaa65 Adds wooden buckets, craftable with botany. 2017-09-09 17:16:34 -04:00
Leshana e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
PsiOmegaDeltaandLeshana ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
AnewbeandGitHub 9d2df21777 Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00
Neerti 6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Cerebulon 843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
Neerti 5b4ab95bd5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor 2017-04-14 03:54:23 -04:00
Anewbe 95aff3ae40 Tweaks the message given when a weapon dulls 2017-04-12 16:22:17 -05:00
Anewbe 53b1b6dbc1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling
# Conflicts:
#	icons/obj/weapons.dmi
2017-03-28 22:57:00 -05:00
MagmaRamandGitHub 2f976a22f8 Merge pull request #3158 from Anewbe/fbp_screams
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
Anewbe 73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Anewbe a80ea977d1 Adds Boxcutters 2017-03-23 15:27:48 -05:00
Anewbe cb23c72d8d Adds the whetstone 2017-03-20 23:32:52 -05:00
Neerti 88d62cffdb work 2017-03-14 08:04:29 -04:00
Anewbe 734536bcb9 Material weapon rework 2017-02-24 18:51:44 -06:00
Neerti 828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Yoshax 058b6f1aa3 Further weapon force tweaks 2016-08-07 15:00:25 +01:00
Yoshax 60c4fb436c no message 2016-08-07 01:39:55 +01:00
Yoshax 403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2016-07-22 23:39:19 -04:00
Anewbe a79c8d8768 Unathi knives can now be wielded in unison 2016-07-14 18:14:58 -05:00
SinTwo 976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
EmperorJonandGitHub 108a8743f5 Merge pull request #2070 from Anewbe/pry
Adds a pry var to objects, which checks if the obj can open doors
2016-07-09 10:36:50 +01:00
Anewbe d932462f4f Foam axes don't shatter windows 2016-07-09 00:37:36 -05:00
Anewbe f27fa6cc2b Adds a pry var to objects, which checks if the obj can open doors 2016-07-09 00:24:12 -05:00
Yoshax d076962c51 Spear fix + a change 2016-06-08 03:54:44 +01:00
Yoshax cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Arokha SieyesandYoshax ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Yoshax e2c66a3bf2 Weapon sharpness and edge adjustments 2016-05-12 16:13:41 +01:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
mwerezak 4951790b50 Fixes missing cooldowns, missing cult blade sound.
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
mwerezak 9ef3df66e3 Fixes missing ..() 2016-04-22 04:57:23 -04:00
mwerezak 11c5b10bb9 Refactors various item attack() implementations
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
Kelenius 98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Datraen 204c51597c Two-handed items check.
Adds a check to see if the item can be wielded when given or dropped when it is wielded.
2016-04-09 12:24:17 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00