cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 22:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,021 Commits 13 Branches 0 Tags
b80cdb6e9f5364b370b13bcd02a47a9bbed9d288
Commit Graph

6874 Commits

Author SHA1 Message Date
Mloc
1f835cc9a4 Merge pull request #4892 from Loganbacca/trinary 
Gas mixer and filter variants
 2014-05-04 13:49:52 +01: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
Mloc
5586439dc8 Merge pull request #4878 from mwerezak/horsemask 
Fixes  #4780
 2014-05-03 11:06:41 +01:00
Mloc
f0726e5cee Merge pull request #4881 from Ccomp5950/botfix 
Admin empowerment:  Allowing Admins in IRC to respond to ahelps
 2014-05-03 11:04:43 +01:00
Loganbacca
8e1ac09545 Trinary atmospheric device variants 
- Mirror filter - standard filter with the output mirrored to the opposite side
- T-Mixer - takes left and right inputs then outputs the mix perpendicular to the inputs
- Mirror mixer - standard filter with the output mirrored to the opposite side
- Added all three to pipe dispenser and construction code so they can be built in-game
 2014-05-03 22:01:33 +12: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
Ccomp5950
085c209651 Merge pull request #4845 from RavingManiac/master 
Inflatable barrier fixes
 2014-04-28 12:08:50 -05:00
Chinsky
ae206ac2e7 Merge pull request #4844 from Mloc/bs12-nui 
turfs: fix some playsound ERRORs on areas
 2014-04-28 11:18:22 +04: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
Mloc-Argent
01e1153c00 turfs: fix some playsound ERRORs on areas 
Turf (de)construction playsound()s were using src.loc, instead of src

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-04-27 15:06:42 +01:00
Brian Cook
381a61d6be Centered background on pAI GUIs 2014-04-27 05:22:36 -07:00
suethecake
2b2d64f05f Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 2014-04-27 01:00:16 -06: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
Ccomp5950
b2d03d67a0 Merge pull request #4819 from Mloc/bs12-itemorgans 
human: move organ generation into a species proc
 2014-04-25 15:33:34 -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
2b9833ce0b Monkies / Dionaea nymphs should be able to emote again as well as not talk while dead. 
Removed debug msg from broadcaster.dm (oops)
 2014-04-25 03:15:14 -05:00
Ccomp5950
6a325036b0 Derpfix on Telecoms broadcast message, should fix any problem with arrivals computer having many names. 2014-04-25 03:00:54 -05: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
910a65791a Merge pull request #4800 from Jarcolr/fix 
Adds sugar cane seeds to seed dispenser
 2014-04-23 17:47:53 -05:00
Ccomp5950
f431f625a0 Merge pull request #4799 from Ravensdale/tratior 
Spelling correction: tratior and Tratior to traitor and Traitor
 2014-04-23 17:47:01 -05:00
Ccomp5950
166da096c3 Merge pull request #4794 from faerindel/changecard 
Adding change cards and a couple little changes.
 2014-04-22 17:39:04 -05:00
Ccomp5950
f56ddba067 Merge pull request #4791 from thelegendofbrian/manuals 
Update and clean up of all manuals
 2014-04-22 17:03:10 -05:00
Jarcolr
ca6e12b607 Adds sugar cane seeds to seed vending machine 
This wasn't here: /obj/item/seeds/sugarcaneseed
 2014-04-22 11:58:49 +03:00
Ravensdale
a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07:00
Ccomp5950
223aa25695 Merge pull request #4788 from RavingManiac/dev 
Breakable shuttle windows. Rearranged fitness.
 2014-04-21 22:00:01 -05:00
igalan
7e8ff266a1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ewallet 
Conflicts:
	icons/obj/items.dmi
 2014-04-21 06:07:02 +01:00