Commit Graph

5611 Commits

Author SHA1 Message Date
mwerezak
deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2016-04-22 04:57:23 -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
mwerezak
593f7699db Refactors item_attack.dm
Refactors and cleans up item_attack.dm and related mob attack code

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items.dm
	code/modules/mob/living/bot/bot.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:52:04 -04:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes
Normalises medical item storage size + fixes
2016-04-21 21:07:34 -04:00
Nerezza
24cd704115 Adds EMT Duffelbags
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Yoshax
0a249df22e Normalises medical item storage size + fixes
Makes all first aid kits the same size,
Fixes pill bottles not holding 14 pills,
Fixes antag surigcal kit not holding all the items.

Adds a max weight class of 1 to pill bottles

Properly adjusts antag surgical kit size
2016-04-21 16:15:45 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
EmperorJon
28ab131610 Merge pull request #1441 from Yoshax/clickcooldownfix
Adds click cooldowns for attacking non-mob atoms for various mob types +other
2016-04-19 17:58:03 +01:00
Yoshax
a77d9269b0 Reduces table climbing time by one third 2016-04-18 18:29:03 +01:00
HarpyEagle
5faf635fae Adds click cooldown for certain cleanables 2016-04-18 15:27:12 +01:00
Neerti
69a4242b17 Inventory Tweaks 1
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
2016-04-16 10:28:14 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Mark9013100
2accd60a5b Moves detective clothing from the cabinet to wardrobe 2016-04-15 13:27:28 -04:00
EmperorJon
2218b94e82 Merge pull request #1387 from Datraen/TwohandDropCheck
Two-handed items drop check.
2016-04-09 17:53:31 +01: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
Anewbe
ac79c48293 Lunchboxes should now fit in backpacks
* Lunchboxes should now fit in backpacks

* Makes lunchbox max_w_class 2
2016-04-06 20:19:55 -04:00
Neerti
25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
Datraen
e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
PsiOmegaDelta
48b773fcfa Can now select the design and contents of your loadout lunchbox.
Also allows gear tweaks to take up a whole row on their own, due to potential length.
Also fixes a couple of incorrect && logical operations. Should have been ||.
2016-04-05 11:57:30 -04:00
EmperorJon
daf7c1065e Merge pull request #1349 from Neerti/4/4/2016_communicator_fix
Communicator Fix
2016-04-04 15:06:35 +01:00
Neerti
5b47212f48 Communicator Fix
Communicators now initialize properly, and are no longer invisible until the owner clicks the device in their hand for the first time in the round.
2016-04-04 05:17:07 -04:00
Yoshax
fc845d12af Adds a missing comma 2016-04-03 17:31:51 +01:00
Yoshax
35d8092d98 Further cleans up pathing in file 2016-04-03 17:26:23 +01:00
Yoshax
a7e5116598 Adds lunchboxes 2016-04-03 17:12:01 +01:00
woodratt
1f3556316d 1.4.9 Hotfix
- Phoron tank in atmos brought back into OSHA non-compliance
- Extra table in the starboard aid station removed.
- Missing air alarms in visitor rooms added.
- Derelict shop area updated.
- Manhack grenade fixed for heist.
- Two of the three spike throwers removed.
- Three new "hair" styles added for Teshari, fixed one broken one.
- Toxins mixing chamber now starts airless.
- Framework in place to allow for a custom item (white cane)
- Fixed access restrictions on riot control maintenance door.
- Firelock added to CE's office door. Entryway from the CE's office to the monitoring room added.
- Fixed a camera in the detective's office.
- Anchored the exonet node on T-comms.
- Fixed Dufflebag in hand sprites.
2016-04-02 15:44:37 -07:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb
Adds the medical webbing
2016-04-01 16:53:58 -04:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Mark9013100
d637e6bc8e Janitor Edits 2016-04-01 04:55:39 -04:00
Mark9013100
1522026190 Detectives now spawn with CSI Kit 2016-03-30 11:50:54 -04:00
Neerti
015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes
Map fixes, minor edits
2016-03-30 02:25:35 -04:00
Neerti
e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs
Adds Navy Blue scrubs
2016-03-30 02:24:07 -04:00
Neerti
a9b2e7a61e Merge pull request #1133 from Kelenius/coolBots
Overhauls bot AI
2016-03-30 02:23:28 -04:00
Datraen
3809e92adf Merge pull request #1214 from Yoshax/morepreferences
Makes it possible to have more than 16 preferences
2016-03-29 14:44:47 -04:00
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Mark9013100
f57eef764f Bedsheets can be worn as capes 2016-03-28 22:01:37 -04:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master
Adds wallets to loadout menu
2016-03-28 12:49:57 -04:00
Mark9013100
26358bf1ab Map edits, minor fixes 2016-03-28 00:02:20 -04:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Neerti
0844d0b9f0 Merge pull request #1239 from Mark9013100/3/23/2016layering
Layering fixes for bedsheets/curtains
2016-03-26 17:06:54 -04:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update
Construction update
2016-03-26 15:45:19 -04:00
Neerti
57b6fe7aa8 Merge pull request #1169 from Kelenius/fixesOnly
Axes old wire, fixes costs in lathe
2016-03-26 15:42:25 -04:00
Datraen
c09bb6d807 Removes JSON encoding of PDA Manifest list. 2016-03-26 15:31:08 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis
Attempts to port bay's travis update attempts
2016-03-26 13:18:55 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Yoshax
288be19de4 Changes some antag items to not have 'suspicious' in their name 2016-03-25 19:28:49 +00:00
Mark9013100
5f734effbc Armor can now hold maglights 2016-03-23 20:14:56 -04:00