Commit Graph

107 Commits

Author SHA1 Message Date
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
EmperorJon
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 Sieyes
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
Kelenius
25e7dbb86f Cuts down shard spam 2016-03-14 14:46:43 +03:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Zuhayr
36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr
0a2cf6ad46 Converted two-handed weapons to use the same wielding mechanic as guns. 2016-01-21 01:40:40 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options.
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
sabess
00323ad7ad The Final Fix probably maybe hopefully 2015-12-19 14:11:26 +11:00
sabess
a9a0573237 Removed brass knuckles from steel sheets, added to hacked autolathe. 2015-12-18 13:16:09 +11:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous.
#11370
2015-12-16 20:07:35 +03:00
Zuhayr
1ea7aebb62 Added boot knives and putting a knife in your boot. 2015-12-11 15:55:23 +10:30
Zuhayr
10bee3618c Bats can now be slung over your back. 2015-12-11 15:52:29 +10:30
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means.
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
2015-10-22 16:52:07 +02:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00