cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

What kind of a PR is Soap? (#9306)

Browse Source
This commit is contained in:
Doxxmedearly
2020-07-09 19:11:34 -05:00
committed by GitHub
parent f41765b256
commit a058e947b2
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/weapons/soap.dm
View File

@@ -19,16 +19,17 @@
var/key_data
var/clean_msg
var/last_clean
var/capacity = 10
drop_sound = 'sound/misc/slip.ogg'
/obj/item/soap/New()
..()
create_reagents(10)
create_reagents(capacity)
wet()
/obj/item/soap/proc/wet()
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
reagents.add_reagent(/datum/reagent/spacecleaner, 10)
reagents.add_reagent(/datum/reagent/spacecleaner, capacity)
/obj/item/soap/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/key))
@@ -112,6 +113,7 @@
desc = "An untrustworthy bar of soap. Smells of fear."
icon_state = "soapsyndie"
item_state = "soapsyndie"
capacity = 20
/obj/item/soap/space_soap
name = "Soap"

5
code/modules/mob/living/silicon/robot/robot_items.dm
View File

@@ -421,6 +421,11 @@
/obj/item/weldingtool/robotic
icon = 'icons/obj/robot_items.dmi'
/obj/item/soap/drone
name = "integrated soap"
desc = "An advanced bar of soap that connects to an internal reservoir of a custodial bot, allowing it to stay wet for longer periods of time."
capacity = 50
/obj/item/inductive_charger
name = "inductive charger"
desc = "A phoron-enhanced induction charger hooked up to its attached stationbound's internal cell."

6
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -531,7 +531,7 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/janitor/New()
..()
src.modules += new /obj/item/soap/nanotrasen(src)
src.modules += new /obj/item/soap/drone(src)
src.modules += new /obj/item/storage/bag/trash(src)
src.modules += new /obj/item/mop(src)
src.modules += new /obj/item/device/lightreplacer/advanced(src)
@@ -603,7 +603,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/robot_harvester(src)
src.modules += new /obj/item/material/kitchen/rollingpin(src)
src.modules += new /obj/item/material/knife(src)
src.modules += new /obj/item/soap(src) // a cheap bar of soap
src.modules += new /obj/item/soap/drone(src)
src.modules += new /obj/item/reagent_containers/glass/rag(src) // a rag for.. yeah.. the primary tool of bartender
src.modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually.
src.modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards.
@@ -860,7 +860,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/device/multitool/robotic(src)
src.modules += new /obj/item/device/lightreplacer(src)
src.modules += new /obj/item/gripper(src)
src.modules += new /obj/item/soap(src)
src.modules += new /obj/item/soap/drone(src)
src.modules += new /obj/item/gripper/no_use/loader(src)
src.modules += new /obj/item/extinguisher(src)
src.modules += new /obj/item/rfd/piping/borg(src)