Mloc-Argent
e24dd57a65
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 22:42:03 +01:00
Ccomp5950
bc21d1734c
Merge pull request #4962 from mwerezak/internal-storage-ground-fix
...
Internal storage fix
2014-05-12 11:41:48 -05:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Loganbacca
f32d281132
Compressed matter implanter fix
...
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
2014-05-11 18:30:18 +12:00
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
Zuhayr
1fc3ecf145
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
2014-05-10 01:40:11 +09:30
Zuhayr
9f2f5fb488
Fixes #4808
2014-05-10 00:30:03 +09:30
Mloc-Argent
a2b85c31a4
Merge remote-tracking branch 'upstream/master' into dev
2014-05-07 17:37:29 +01:00
Zuhayr
a1f6b7a211
Merge pull request #4885 from mwerezak/equipment-fixes
...
Misc Equipment fixes - Mostly hardsuits
2014-05-07 09:59:44 +09:30
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01: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
Mloc-Argent
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
Zuhayr
0e39f18763
Compile fix.
2014-05-03 23:17:08 +09:30
Zuhayr
5b32150858
Fixes for previous commit, sigh.
2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a
Adding some repair procs to cables and welders for IPC use.
2014-05-03 21:10:26 +09:30
Mike
946fd5329f
Fixed null flag for cigarette type
2014-05-02 15:59:47 -04: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
Ccomp5950
976ae06e6b
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/say.dm
code/modules/paperwork/paper.dm
code/modules/telesci/bscrystal.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Mloc
74ef3765d0
Merge pull request #4825 from DJSnapshot/hotfix
...
IPC fixes
2014-04-25 21:32:45 +01:00
DJSnapshot
a6fbde8f2f
Fixes for Mloc, part 2.
2014-04-25 13:31:10 -07:00
Ccomp5950
93b398b4e6
Some more fixes.
...
Derp fix on objects, we check mob contents instead of src.contents for any objects that can hear and pass hear_talk on to it.
Tape recorder will record the verb sent instead of doing it's own thing with verbs.
2014-04-25 02:02:45 -05: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
DJSnapshot
bd2b46078a
fix for https://github.com/Baystation12/Baystation12/issues/4548
2014-04-20 21:57:23 -07:00
DJSnapshot
13237e315f
Fix for https://github.com/Baystation12/Baystation12/issues/4512
2014-04-20 21:46:13 -07:00
Brian Cook
804e3f1a29
Update and clean up of all manuals
...
- Fixed typos
- Fixed grammar/punctuation
- Corrected out-of-date details
- Formatted to match font type and size of rest of the game
2014-04-20 16:09:57 -07: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
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07: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
Ccomp5950
82d4d3a497
Merge pull request #4712 from Jarcolr/kilo
...
Fix for #4701 and immersion
2014-04-07 02:20:55 -05:00
Jarcolr
b83e0f2ad7
Adds additional text to lighting
2014-04-06 13:24:44 +03:00
Jarcolr
b6ee8a62b0
Fix for 4601 and immersion
...
Premium Cigar now understands being lit,and the corn cob pipe/ cigars
now no longer refuse being hit by fire.
2014-04-06 12:43:58 +03: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
