cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the sleeper code a bit.

Browse Source 
Monkey boxes lowered to 2 monkeys per box and the crate now costs net 15 points for one box. They were also removed from vending machines.  I warned that they would be changed if people continued to spam them.
Windows and disposal pipes layers adjusted slightly.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2204 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-15 06:07:33 +00:00
parent 565ccf9bd5
commit 90bd0c9d68
7 changed files with 237 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/recycling/disposal.dm
View File

@@ -577,7 +577,7 @@
var/dpdir = 0 // bitmask of pipe directions var/dpdir = 0 // bitmask of pipe directions
dir = 0 // dir will contain dominant direction for junction pipes dir = 0 // dir will contain dominant direction for junction pipes
var/health = 10 // health points 0-10 var/health = 10 // health points 0-10
layer = 2.4 // slightly lower than wires layer = 2.3 // slightly lower than wires and other pipes
var/base_icon_state // initial icon state on map var/base_icon_state // initial icon state on map
// new pipe, set the icon_state as on map // new pipe, set the icon_state as on map

5
code/defines/obj/supplypacks.dm
View File

@@ -35,9 +35,8 @@
/datum/supply_packs/monkey /datum/supply_packs/monkey
name = "Monkey crate" name = "Monkey crate"
contains = list ("/obj/item/weapon/monkeycube_box", contains = list ("/obj/item/weapon/monkeycube_box")
"/obj/item/weapon/monkeycube_box") cost = 20
cost = 10
containertype = "/obj/crate/freezer" containertype = "/obj/crate/freezer"
containername = "Monkey crate" containername = "Monkey crate"

4
code/defines/obj/vending.dm
View File

@@ -66,8 +66,8 @@
product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/obj/item/weapon/reagent_containers/food/drinks/dry_ramen;/obj/item/weapon/reagent_containers/food/snacks/chips;/obj/item/weapon/reagent_containers/food/snacks/sosjerky;/obj/item/weapon/reagent_containers/food/snacks/no_raisin;/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie;/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers" product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/obj/item/weapon/reagent_containers/food/drinks/dry_ramen;/obj/item/weapon/reagent_containers/food/snacks/chips;/obj/item/weapon/reagent_containers/food/snacks/sosjerky;/obj/item/weapon/reagent_containers/food/snacks/no_raisin;/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie;/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers"
product_amounts = "10;10;10;10;10;10;10" product_amounts = "10;10;10;10;10;10;10"
product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/syndicake;/obj/item/weapon/monkeycube_box" product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/syndicake"
product_hideamt = "10;1" product_hideamt = "10"
/obj/machinery/vending/cola /obj/machinery/vending/cola

1
code/defines/obj/window.dm
View File

@@ -3,6 +3,7 @@
icon = 'structures.dmi' icon = 'structures.dmi'
desc = "A window." desc = "A window."
density = 1 density = 1
layer = 3.2//Just above doors
var/health = 14.0 var/health = 14.0
var/ini_dir = null var/ini_dir = null
var/state = 0 var/state = 0

163
code/game/machinery/Sleeper.dm
View File

@@ -135,49 +135,30 @@
icon = 'Cryogenic2.dmi' icon = 'Cryogenic2.dmi'
icon_state = "sleeper_0" icon_state = "sleeper_0"
density = 1 density = 1
var/occupied = 0 // So there won't be multiple persons trying to get into one sleeper
var/mob/occupant = null
anchored = 1 anchored = 1
var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r" var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
var/mob/occupant = null
/obj/machinery/sleeper/New() New()
..() ..()
spawn( 5 ) spawn( 5 )
if(orient == "RIGHT") if(orient == "RIGHT")
icon_state = "sleeper_0-r" icon_state = "sleeper_0-r"
return return
return return
/obj/machinery/sleeper/dummy//For effects only.
icon_state = "sleeper_1"
/obj/machinery/sleeper/allow_drop() allow_drop()
return 0 return 0
/obj/machinery/sleeper/process()
process()
src.updateDialog() src.updateDialog()
return return
/obj/machinery/sleeper/ex_act(severity)
switch(severity)
if(1.0)
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
ex_act(severity)
del(src)
return
if(2.0)
if (prob(50))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
ex_act(severity)
del(src)
return
return
/obj/machinery/sleeper/blob_act() blob_act()
if(prob(75)) if(prob(75))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.loc = src.loc
@@ -185,27 +166,29 @@
del(src) del(src)
return return
/obj/machinery/sleeper/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
if ((!( istype(G, /obj/item/weapon/grab) ) || !( ismob(G.affecting) ))) attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
if((!( istype(G, /obj/item/weapon/grab)) || !( ismob(G.affecting))))
return return
if (src.occupant) if(src.occupant)
user << "\blue <B>The sleeper is already occupied!</B>" user << "\blue <B>The sleeper is already occupied!</B>"
return return
// Removing the requirement for subjects to be naked -- TLE
/* if (G.affecting.abiotic())
user << "Subject may not have abiotic items on."
return */
for(var/mob/living/carbon/metroid/M in range(1,G.affecting)) for(var/mob/living/carbon/metroid/M in range(1,G.affecting))
if(M.Victim == G.affecting) if(M.Victim == G.affecting)
usr << "[G.affecting.name] will not fit into the sleeper because they have a Metroid latched onto their head." usr << "[G.affecting.name] will not fit into the sleeper because they have a Metroid latched onto their head."
return return
for (var/mob/V in viewers(user)) for (var/mob/V in viewers(user))
occupied = 1
V.show_message("[user] starts putting [G.affecting.name] into the sleeper.", 3) V.show_message("[user] starts putting [G.affecting.name] into the sleeper.", 3)
if(do_after(user, 20)) if(do_after(user, 20))
if(src.occupant)
user << "\blue <B>The sleeper is already occupied!</B>"
return
if(!G || !G.affecting) return if(!G || !G.affecting) return
var/mob/M = G.affecting var/mob/M = G.affecting
if (M.client) if(M.client)
M.client.perspective = EYE_PERSPECTIVE M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src M.client.eye = src
M.loc = src M.loc = src
@@ -219,14 +202,10 @@
src.add_fingerprint(user) src.add_fingerprint(user)
del(G) del(G)
return return
else
occupied = 0
return return
/obj/machinery/sleeper/dummy/attackby()
return
/obj/machinery/sleeper/ex_act(severity) ex_act(severity)
switch(severity) switch(severity)
if(1.0) if(1.0)
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
@@ -235,23 +214,23 @@
del(src) del(src)
return return
if(2.0) if(2.0)
if (prob(50)) if(prob(50))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.loc = src.loc
ex_act(severity) ex_act(severity)
del(src) del(src)
return return
if(3.0) if(3.0)
if (prob(25)) if(prob(25))
for(var/atom/movable/A as mob|obj in src) for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc A.loc = src.loc
ex_act(severity) ex_act(severity)
del(src) del(src)
return return
else
return return
/obj/machinery/sleeper/alter_health(mob/living/M as mob)
alter_health(mob/living/M as mob)
if (M.health > 0) if (M.health > 0)
if (M.oxyloss >= 10) if (M.oxyloss >= 10)
var/amount = max(0.15, 1) var/amount = max(0.15, 1)
@@ -262,79 +241,84 @@
M.paralysis -= 4 M.paralysis -= 4
M.weakened -= 4 M.weakened -= 4
M.stunned -= 4 M.stunned -= 4
if (M.paralysis <= 1) if (M.paralysis < 1)
M.paralysis = 3 M.paralysis = 1
if (M.weakened <= 1) if (M.weakened < 1)
M.weakened = 3 M.weakened = 1
if (M.stunned <= 1) if (M.stunned < 1)
M.stunned = 3 M.stunned = 1
if (M:reagents.get_reagent_amount("inaprovaline") < 5) if (M:reagents.get_reagent_amount("inaprovaline") < 5)
M:reagents.add_reagent("inaprovaline", 5) M:reagents.add_reagent("inaprovaline", 5)
return return
/obj/machinery/sleeper/proc/go_out()
if (!src.occupant) proc/go_out()
if(!src.occupant)
return return
for(var/obj/O in src) for(var/obj/O in src)
O.loc = src.loc O.loc = src.loc
if (src.occupant.client) if(src.occupant.client)
src.occupant.client.eye = src.occupant.client.mob src.occupant.client.eye = src.occupant.client.mob
src.occupant.client.perspective = MOB_PERSPECTIVE src.occupant.client.perspective = MOB_PERSPECTIVE
src.occupant.loc = src.loc src.occupant.loc = src.loc
// src.occupant.metabslow = 0
src.occupant = null src.occupant = null
if(orient == "RIGHT") if(orient == "RIGHT")
icon_state = "sleeper_0-r" icon_state = "sleeper_0-r"
return return
/obj/machinery/sleeper/proc/inject_inap(mob/user as mob)
if (src.occupant) proc/inject_inap(mob/user as mob)
if (src.occupant.reagents.get_reagent_amount("inaprovaline") + 30 <= 60) if(src.occupant)
if(src.occupant.reagents.get_reagent_amount("inaprovaline") + 30 <= 60)
src.occupant.reagents.add_reagent("inaprovaline", 30) src.occupant.reagents.add_reagent("inaprovaline", 30)
user << text("Occupant now has [] units of Inaprovaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("inaprovaline")) user << text("Occupant now has [] units of Inaprovaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("inaprovaline"))
else else
user << "No occupant!" user << "No occupant!"
return return
/obj/machinery/sleeper/proc/inject_stox(mob/user as mob)
if (src.occupant) proc/inject_stox(mob/user as mob)
if (src.occupant.reagents.get_reagent_amount("stoxin") + 20 <= 40) if(src.occupant)
if(src.occupant.reagents.get_reagent_amount("stoxin") + 20 <= 40)
src.occupant.reagents.add_reagent("stoxin", 20) src.occupant.reagents.add_reagent("stoxin", 20)
user << text("Occupant now has [] units of soporifics in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("stoxin")) user << text("Occupant now has [] units of soporifics in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("stoxin"))
else else
user << "No occupant!" user << "No occupant!"
return return
/obj/machinery/sleeper/proc/inject_dermaline(mob/user as mob)
proc/inject_dermaline(mob/user as mob)
if (src.occupant) if (src.occupant)
if (src.occupant.reagents.get_reagent_amount("dermaline") + 20 <= 40) if(src.occupant.reagents.get_reagent_amount("dermaline") + 20 <= 40)
src.occupant.reagents.add_reagent("dermaline", 20) src.occupant.reagents.add_reagent("dermaline", 20)
user << text("Occupant now has [] units of Dermaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dermaline")) user << text("Occupant now has [] units of Dermaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dermaline"))
else else
user << "No occupant!" user << "No occupant!"
return return
/obj/machinery/sleeper/proc/inject_bicaridine(mob/user as mob) //GRAND AGOURI MARKER
if (src.occupant) proc/inject_bicaridine(mob/user as mob)
if (src.occupant.reagents.get_reagent_amount("bicaridine") + 10 <= 20) if(src.occupant)
if(src.occupant.reagents.get_reagent_amount("bicaridine") + 10 <= 20)
src.occupant.reagents.add_reagent("bicaridine", 10) src.occupant.reagents.add_reagent("bicaridine", 10)
user << text("Occupant now has [] units of Bicaridine in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("bicaridine")) user << text("Occupant now has [] units of Bicaridine in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("bicaridine"))
else else
user << "No occupant!" user << "No occupant!"
return return
/obj/machinery/sleeper/proc/inject_dexalin(mob/user as mob) //GRAND AGOURI MARKER
if (src.occupant) proc/inject_dexalin(mob/user as mob)
if (src.occupant.reagents.get_reagent_amount("dexalin") + 20 <= 40) if(src.occupant)
if(src.occupant.reagents.get_reagent_amount("dexalin") + 20 <= 40)
src.occupant.reagents.add_reagent("dexalin", 20) src.occupant.reagents.add_reagent("dexalin", 20)
user << text("Occupant now has [] units of Dexalin in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dexalin")) user << text("Occupant now has [] units of Dexalin in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dexalin"))
else else
user << "No occupant!" user << "No occupant!"
return return
/obj/machinery/sleeper/proc/check(mob/user as mob)
if (src.occupant) proc/check(mob/user as mob)
if(src.occupant)
user << text("\blue <B>Occupant ([]) Statistics:</B>", src.occupant) user << text("\blue <B>Occupant ([]) Statistics:</B>", src.occupant)
var/t1 var/t1
switch(src.occupant.stat) switch(src.occupant.stat)
@@ -357,55 +341,46 @@
user << "\blue There is no one inside!" user << "\blue There is no one inside!"
return return
/obj/machinery/sleeper/verb/eject()
verb/eject()
set name = "Eject Sleeper" set name = "Eject Sleeper"
set category = "Object" set category = "Object"
set src in oview(1) set src in oview(1)
if(usr.stat != 0)
if (usr.stat != 0)
return return
if(orient == "RIGHT") if(orient == "RIGHT")
icon_state = "sleeper_0-r" icon_state = "sleeper_0-r"
src.icon_state = "sleeper_0" src.icon_state = "sleeper_0"
src.go_out() src.go_out()
add_fingerprint(usr) add_fingerprint(usr)
occupied = 0
return return
/obj/machinery/sleeper/dummy/eject()
set category = null
set hidden = 1
return verb/move_inside()
/obj/machinery/sleeper/verb/move_inside()
set name = "Enter Sleeper" set name = "Enter Sleeper"
set category = "Object" set category = "Object"
set src in oview(1) set src in oview(1)
if (usr.stat != 0) if(usr.stat != 0)
return return
if (occupied) if(src.occupant)
usr << "\blue <B>The sleeper is already occupied!</B>" usr << "\blue <B>The sleeper is already occupied!</B>"
return return
/* if (usr.abiotic()) // Removing the requirement for user to be naked -- TLE
usr << "Subject may not have abiotic items on."
return*/
for(var/mob/living/carbon/metroid/M in range(1,usr)) for(var/mob/living/carbon/metroid/M in range(1,usr))
if(M.Victim == usr) if(M.Victim == usr)
usr << "You're too busy getting your life sucked out of you." usr << "You're too busy getting your life sucked out of you."
return return
for (var/mob/V in viewers(usr)) for(var/mob/V in viewers(usr))
occupied = 1
V.show_message("[usr] starts climbing into the sleeper.", 3) V.show_message("[usr] starts climbing into the sleeper.", 3)
if(do_after(usr, 20)) if(do_after(usr, 20))
if(src.occupant)
usr << "\blue <B>The sleeper is already occupied!</B>"
return
usr.pulling = null usr.pulling = null
usr.client.perspective = EYE_PERSPECTIVE usr.client.perspective = EYE_PERSPECTIVE
usr.client.eye = src usr.client.eye = src
usr.loc = src usr.loc = src
// usr.metabslow = 1
src.occupant = usr src.occupant = usr
src.icon_state = "sleeper_1" src.icon_state = "sleeper_1"
if(orient == "RIGHT") if(orient == "RIGHT")
@@ -415,12 +390,4 @@
del(O) del(O)
src.add_fingerprint(usr) src.add_fingerprint(usr)
return return
else
occupied = 0
return
/obj/machinery/sleeper/dummy/move_inside()
set category = null
set hidden = 1
return return

2
code/game/objects/items/food.dm
View File

@@ -170,7 +170,7 @@ MONKEY CUBE BOX
desc = "Drymate brand monkey cubes. Just add water!" desc = "Drymate brand monkey cubes. Just add water!"
icon = 'food.dmi' icon = 'food.dmi'
icon_state = "monkeycubebox" icon_state = "monkeycubebox"
var/amount = 5 var/amount = 2
attack_hand(mob/user as mob, unused, flag) attack_hand(mob/user as mob, unused, flag)
add_fingerprint(user) add_fingerprint(user)

22
code/modules/food/food.dm
View File

@@ -959,27 +959,6 @@
baconbeacon.loc = usr baconbeacon.loc = usr
baconbeacon.digest_delay() baconbeacon.digest_delay()
/*
/obj/item/weapon/reagent_containers/food/snacks/bananaphone
name = "Banana Phone"
desc = "Ring ring ring ring ring..."
icon = 'items.dmi'
icon_state = "banana" //needs a new icon.
bitesize = 5
var/obj/item/device/radio/banana/bananaphone
New()
..()
reagents.add_reagent("banana", 5)
bananaphone = new /obj/item/device/radio/banana(src)
bananaphone.listening = 1
bananaphone.broadcasting = 1
On_Consume()
if(!reagents.total_volume)
usr << sound('bananaphone.ogg',1)
hear_talk(mob/M as mob, msg)
if(bananaphone)
bananaphone.hear_talk(M, msg)*/
/obj/item/weapon/reagent_containers/food/snacks/monkeycube /obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube" name = "monkey cube"
@@ -1021,6 +1000,7 @@
icon_state = "monkeycubewrap" icon_state = "monkeycubewrap"
wrapped = 1 wrapped = 1
/obj/item/weapon/reagent_containers/food/snacks/spellburger /obj/item/weapon/reagent_containers/food/snacks/spellburger
name = "Spell Burger" name = "Spell Burger"
desc = "This is absolutely Ei Nath." desc = "This is absolutely Ei Nath."