cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-20 12:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix all my broken shit

Browse Source 
fixes all my broken shit
This commit is contained in:
jbox1
2020-03-21 19:20:40 +11:00
parent 70656012ba
commit 48497038ef
6 changed files with 103 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/modules/crafting/recipes.dm
+11
View File
@@ -0,0 +1,11 @@
/datum/crafting_recipe/milker
name = "Milking Machine"
reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/rods = 2, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/stock_parts/manipulator = 1)
result = /obj/item/milker
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
category = CAT_MISC
/datum/crafting_recipe/milker/penis
name = "Penis Milking Machine"
reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/rods = 1, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker/large = 1, /obj/item/stock_parts/manipulator = 1)
result = /obj/item/milker/penis
hyperstation/code/obj/milking machine.dm
+83
View File
@@ -0,0 +1,83 @@
/obj/item/milker
icon = 'hyperstation/icons/obj/milking_machine.dmi'
name = "milking machine"
icon_state = "Off"
item_state = "Off"
desc = "A pocket sized pump and tubing assembly designed to collect and store products from mammary glands."
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKET
var/on = FALSE
var/obj/item/reagent_containers/glass/inserted_item = null
var/transfer_rate = 0.25 // How much we transfer every 2 seconds
var/target_organ = "breasts" // What organ we are transfering from
/obj/item/milker/examine(mob/user)
. = ..()
to_chat(user, "<span class='notice'>[src] is currently [on ? "on" : "off"].</span>")
if (inserted_item)
to_chat(user, "<span class='notice'>[inserted_item] contains [inserted_item.reagents.total_volume]/[inserted_item.reagents.maximum_volume] units</span>")
/obj/item/milker/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/reagent_containers/glass) && !inserted_item)
if(!user.transferItemToLoc(W, src))
return ..()
inserted_item = W
UpdateIcon()
else
return ..()
/obj/item/milker/interact(mob/user)
if(!isAI(user) && inserted_item)
add_fingerprint(user)
on = !on
if (on)
to_chat(user, "<span class='notice'>You turn [src] on.</span>")
START_PROCESSING(SSobj, src)
else
to_chat(user, "<span class='notice'>You turn [src] off.</span>")
STOP_PROCESSING(SSobj, src)
UpdateIcon()
else
..()
/obj/item/milker/proc/UpdateIcon()
icon_state = "[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]"
item_state = icon_state
/obj/item/milker/AltClick(mob/living/user)
add_fingerprint(user)
user.put_in_hands(inserted_item)
inserted_item = null
on = FALSE
STOP_PROCESSING(SSobj, src)
UpdateIcon()
/obj/item/milker/process()
var/mob/living/carbon/W = loc
if (W)
var/obj/item/organ/genital/breasts/O = W.getorganslot(target_organ)
if (O)
if (O.reagents.total_volume >= transfer_rate * 2)
if (inserted_item.reagents.total_volume < inserted_item.reagents.maximum_volume)
O.reagents.trans_to(inserted_item.reagents, amount = transfer_rate)
else
to_chat(W, "<span class='notice'>[src] stops pumping. [inserted_item] is full.</span>")
on = FALSE
STOP_PROCESSING(SSobj, src)
UpdateIcon()
/obj/item/milker/penis
name = "penis milking machine"
icon_state = "PenisOff"
item_state = "PenisOff"
desc = "A pocket sized pump and tubing assembly designed to collect and store products from the penis."
target_organ = "testicles" // Since semen is stored in the balls
/obj/item/milker/penis/UpdateIcon()
icon_state = "Penis[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]"
item_state = icon_state
modular_citadel/icons/obj/milking machine.dmi → hyperstation/icons/obj/milking_machine.dmi
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 772 B

modular_citadel/code/modules/crafting/recipes.dm
-11
View File
@@ -10,14 +10,3 @@
result = /obj/item/aicard/potato
category = CAT_ROBOT
/datum/crafting_recipe/milker
name = "Milking Machine"
reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 2, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/stock_parts/manipulator = 1)
result = /obj/item/milker
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
category = CAT_MISC
/datum/crafting_recipe/milker/penis
name = "Penis Milking Machine"
reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker/large = 1, /obj/item/stock_parts/manipulator = 1)
result = /obj/item/milker/penis
modular_citadel/code/modules/reagents/reagent container/milking machine.dm
+5 -5
View File
@@ -9,7 +9,7 @@
var/on = FALSE
var/obj/item/reagent_containers/glass/inserted_item = null
var/transfer_rate = 0.25 // How much we transfer every 2 seconds
var/target_organ = "breasts" // What organ we are transfering from
@@ -42,11 +42,11 @@
UpdateIcon()
else
..()
/obj/item/milker/proc/UpdateIcon()
icon_state = "[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]"
item_state = icon_state
/obj/item/milker/AltClick(mob/living/user)
add_fingerprint(user)
@@ -75,9 +75,9 @@
icon_state = "PenisOff"
item_state = "PenisOff"
desc = "A pocket sized pump and tubing assembly designed to collect and store products from the penis."
target_organ = "testicles" // Since semen is stored in the balls
/obj/item/milker/penis/UpdateIcon()
icon_state = "Penis[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]"
item_state = icon_state
tgstation.dme
+4
View File
@@ -2871,11 +2871,14 @@
#include "code\modules\zombie\items.dm"
#include "code\modules\zombie\organs.dm"
#include "hyperstation\code\gamemode\werewolf\werewolf.dm"
#include "hyperstation\code\mobs\hugbot.dm"
#include "hyperstation\code\mobs\mimic.dm"
#include "hyperstation\code\mobs\werewolf.dm"
#include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm"
#include "hyperstation\code\modules\crafting\recipes.dm"
#include "hyperstation\code\obj\decal.dm"
#include "hyperstation\code\obj\fluff.dm"
#include "hyperstation\code\obj\milking machine.dm"
#include "hyperstation\code\obj\plushes.dm"
#include "hyperstation\code\obj\pregnancytester.dm"
#include "hyperstation\code\obj\rewards.dm"
@@ -3016,6 +3019,7 @@
#include "modular_citadel\code\modules\clothing\under\trek_under.dm"
#include "modular_citadel\code\modules\clothing\under\turtlenecks.dm"
#include "modular_citadel\code\modules\clothing\under\under.dm"
#include "modular_citadel\code\modules\crafting\recipes.dm"
#include "modular_citadel\code\modules\custom_loadout\custom_items.dm"
#include "modular_citadel\code\modules\custom_loadout\load_to_mob.dm"
#include "modular_citadel\code\modules\custom_loadout\read_from_file.dm"