Commit Graph

3356 Commits

Author SHA1 Message Date
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
Mike
d684a77119 Fixes #4780 2014-05-01 23:58:47 -04:00
Hubblenaut
5b18ec42c4 Fixed Tape Recorders printing transcripts with a 'paper'-prefix 2014-05-02 02:17:46 +02:00
Chinsky
ebf9f86afd Merge pull request #4858 from mwerezak/webbing
Storage and Clothing/Accessory Changes and Cleanup
2014-05-01 03:38:19 +04:00
Ravensdale
b8696668a7 Fix for problem #2891 2014-04-30 08:20:44 -07: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
Ccomp5950
7f5b5bb5af Merge pull request #4851 from thelegendofbrian/pAI
pAI GUI Massive Update
2014-04-29 18:49:54 -05: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
Brian Cook
6b16a4140c Added missing header to pAI Request Module
Also changed max frequency of radio config to 159.9 instead of 159.1
2014-04-28 16:56:39 -07:00
Brian Cook
67da07445b Added refresh button to host bioscan page
Also tweaked all pAI GUI so the background doesn't repeat-y
2014-04-28 13:26:52 -07:00
RavingManiac
96b7647039 Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts. 2014-04-28 00:28:06 +08:00
Brian Cook
381a61d6be Centered background on pAI GUIs 2014-04-27 05:22:36 -07:00
Brian Cook
2ea7ff44a3 Improved GUI for users interfacing with pAI
Also minor tweak to GUI for requesting pAI.
2014-04-26 20:13:22 -07:00
Brian Cook
cca92a2e85 Improved GUI for requesting pAI
Made the pAI Request Module and the pAI Availability List pretty.
2014-04-26 17:10:37 -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
Brian Cook
97c2735820 Fixed pAI Digital Messenger and layout tweaks 2014-04-25 00:12:26 -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
Brian Cook
6d67400f74 Refined GUI more
pAI background updated and no longer externally referenced. Corrected
stray typos. Added more power on/off lights for certain downloaded
modules.
2014-04-24 18:17:41 -07:00
Brian Cook
b8afd2fc5f pAI GUI changes
The pAI GUI background image still need to be properly linked.
2014-04-24 14:04:32 -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
Ccomp5950
223aa25695 Merge pull request #4788 from RavingManiac/dev
Breakable shuttle windows. Rearranged fitness.
2014-04-21 22:00:01 -05: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
RavingManiac
4fd01c2384 Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1.
Fitness room rearranged to make more sense, with glass around pool.
2014-04-20 22:35:59 +08:00
RKF45
1cfd0c3342 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters
Conflicts:
	code/game/objects/effects/decals/posters/bs12.dm
	icons/obj/contraband.dmi
2014-04-19 19:24:45 +02:00
Chinsky
8777c8c071 Merge pull request #4765 from Jarcolr/devupdate
New posters and sprites
2014-04-19 21:10:51 +04:00
Chinsky
5fffe122dc Merge pull request #4776 from mwerezak/tac-armoury-beanbags
Added beanbag shotguns to the tactical armoury
2014-04-19 14:23:55 +04:00
Mike
2d7dca8eb5 Added beanbag shotguns to the tactical armoury 2014-04-18 20:28:53 -04:00
RKF45
2c839d4c09 Second and final batch 2014-04-18 21:28:27 +02:00
RKF45
56689c887d First load of posters 2014-04-18 20:31:27 +02:00
Mike
e76f431687 Adjusted fuel spread
Made fuel stickier, so it spreads less thinly.
2014-04-17 21:19:05 -04:00
Jarcolr
4bb17b8686 Let there be space
woo
2014-04-17 23:53:27 +03:00
Jarcolr
1e9e50b467 Space and space
Woop.
2014-04-17 15:39:44 +03:00
Jarcolr
b33b71649d New posters - Nienhaus
These are new posters for more postery goodness. Credits for the sprites
go to Nienhaus.
For the sprites of the poster go to http://puu.sh/5QlUx.dmi
2 posters are not included: 6th and 7th due to reasons.
2014-04-17 15:24:11 +03:00
Ravensdale
45d82c2e00 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron
Conflicts:
	code/modules/mob/living/say.dm
	maps/tgstation2.dmm
2014-04-16 22:13:48 -07: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
Chinsky
336a1c09ab Merge pull request #4753 from mwerezak/magboots-action-icon
Magboots action icon
2014-04-14 16:11:52 +04:00