Commit Graph

115 Commits

Author SHA1 Message Date
Mike
cee43ffbf3 Fixes internal storage on ground
Fixes not being able to remove items from internal storage when the
master item is on the ground.
2014-05-10 23:41:48 -04:00
Jarcolr
5bc9ea47e4 Added storage/misc for objs that don't fit in
Also moved the dicepack there.
2014-05-04 00:40:08 +03:00
Mike
ba0dded672 Holsters and Unathi knife harness
Also fixed mistyped path and OnClick bug.
2014-04-29 22:43:10 -04:00
Mike
ae49ba210b Webbings now use internal storage
Clothing no longer manipulates webbing members for better encapsulation.
Instead attackby() and attack_hand() are forwarded to accessories if
they are present.
Removed "Look in Storage" verb for less verb clutter.
2014-04-29 20:34:01 -04:00
Mike
172bda548e Fixed internal storage, added coat pockets
/mob/proc/ClickOn() now checks storage levels, not just contents levels,
now allows items to be taken out of internal storage attached to another
item.
Coats now use internal storage for their pocket slots, removed duplicate
storage code.
Moved coat.dm out of it's special folder and into modules/clothing.
2014-04-29 19:00:36 -04:00
Mike
51f8bfe3ce Fixed accidentally omitted call to parent 2014-04-29 09:37:25 -07:00
Mike
591df34c86 Removed broken backpack unequipping sound 2014-04-29 09:20:21 -07:00
Mike
5a797b8d03 Add internal storage type 2014-04-29 09:18:17 -07:00
Mike
1bbb68e9d2 Backpacks now play sound when un/equipped
They did this before, but that was due to all storage items playing
sound. Now only applies to backpacks.
2014-04-24 21:18:46 -07:00
Mike
e84747510c Cleaned up reference to outdated proc
Removed references to outdated get_equipped_items(). Still one left.
Removed unnecessary override for belts.
2014-04-24 21:01:01 -07:00
Mike
886b3b1cae Storage sound is now controlled by var
Realized the previously removed MouseDrop override for pill bottles was
to stop the rustle sound from playing.
2014-04-24 20:28:50 -07:00
mwerezak
b2234cb774 Rustle sound now plays any time a storage is opened 2014-04-24 12:53:07 -04:00
mwerezak
82499cf50c Updated subtypes of storage to use the new open() proc
Also got rid of /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj). Not sure what it was doing differently.
2014-04-24 12:51:23 -04:00
mwerezak
8109c33749 Removed hold.loc = usr hack from webbings code.
Got rid of the stupid hold.loc = usr hack. Now not necessary, as storage is refactored so that there is now an explicit proc for when a mob opens up a storage to view the contents. Removed the inaccessible if statement in /obj/item/weapon/storage/MouseDrop() (bad automerge?)
2014-04-24 12:24:00 -04:00
Mike
2d7dca8eb5 Added beanbag shotguns to the tactical armoury 2014-04-18 20:28:53 -04:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Mike
b24b39d267 Clean up check for item being equipped
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
2014-04-13 13:36:48 -04:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1
This is just the first one of many.
2014-04-08 14:48:31 +03:00
RavingManiac
ac9d37261f Check restricted to closets and storage items due to lag concerns. 2014-04-07 20:45:05 +08:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
RavingManiac
7c75e591cd Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed. 2014-03-30 21:41:13 +08:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master"
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
2014-03-24 13:54:11 +00:00
iamgoofball
6fa4084d11 Adds 9 new Chameleon items.
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.

The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.

These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
2014-03-23 14:08:23 -07:00
Aryn
1b8dc12a7c I think I fixed everything it is possible to stuff a light source into. 2014-03-19 01:02:27 -06:00
Vetinari
1d62ceddaa Merged Upstream
This is a big one.
2014-03-04 22:19:09 +11:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
suethecake
32de00eed8 Fix to cloned gun issue - now your holster is located on your tactical armor. 2014-02-22 21:50:21 -06:00
Vetinari
cb1c247767 Updates
Medicine Cabinet(s), Acute Doors
2014-02-22 19:26:42 +11:00
Segrain
05c82c970b Tiny fix. 2014-02-22 06:56:51 +03:00
Segrain
2b9842c113 Smallfix. 2014-02-22 06:56:12 +03:00
suethecake
6f69e7f821 Stuff. 2014-01-29 18:15:35 -06:00
Kyrah Abattoir
f91b44b47f correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2014-01-08 19:56:03 +00:00
Kyrah Abattoir
98f02be5a6 code/game/object/items/weapons/* lowercase pass
code/game/object/structure/* lowercase pass (start)

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/vending_items.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2013-12-13 19:13:43 +00:00
Zuhayr
17380e308e Extra check in secure case interaction for aliens. 2013-12-05 22:04:11 +10:30
Zuhayr
a110cfaed7 Fixes #4030 2013-12-05 21:58:33 +10:30
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev
Conflicts:
	icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
Ccomp5950
497c111796 Bugfix: Hyposprays now fit in medical belts.
Problem:  Person fixing bug #2006 was a bit too specific about type of autoinjectors able to fit in belt.

Solution:  Be less specific.  Now hyposprays fit in belts.
2013-11-28 19:25:43 -06:00
Jeremy Liberman
7e22046b1e Add Cash Bag. Works like Plant Bag but for cash/coins 2013-11-23 17:22:01 -06:00
DJSnapshot
63fb3f29ea mecha fixes 2013-11-02 12:26:34 -07:00
DJSnapshot
69389d392c Fix for https://github.com/Baystation12/Baystation12/issues/3813 2013-11-02 11:45:26 -07:00
Segrain
6655ae9b11 Wallets and cards. 2013-10-21 05:10:33 +03:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
7ea98f6d79 Examining fix. 2013-10-11 10:19:58 +03:00
Chinsky
3c7c715e06 Merge pull request #3727 from fauxki/dev
Dev - Lightswitches for Medbay / Beach Holodeck Update
2013-10-08 21:23:42 -07:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
fauxki
a9de4f00f2 * Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck. 2013-10-05 08:25:03 -07:00