mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-23 20:16:19 +01:00
Merge pull request #741 from Shadowfire117/master
weh, reupload because im a derp
This commit is contained in:
AnonymousHybi
@@ -11,4 +11,12 @@
|
||||
var/image/so_far = ..()
|
||||
so_far.pixel_y += 16
|
||||
so_far.pixel_x += 0
|
||||
return so_far
|
||||
return so_far
|
||||
|
||||
/obj/item/clothing/head/soft/purple/wah
|
||||
name = "assistant cap"
|
||||
desc = "What a lovely purple cap, its said its given out as a trophy to assistants. Why does that sound so depressing?"
|
||||
icon_state = "wahcap"
|
||||
item_state_slots = list(slot_r_hand_str = "wahcap", slot_l_hand_str = "wahcap")
|
||||
icon = 'icons/obj/clothing/hats_vr.dmi'
|
||||
icon_override = 'icons/mob/head_vr.dmi'
|
||||
@@ -853,4 +853,16 @@
|
||||
/obj/item/clothing/under/cohesion/hazard
|
||||
name = "hazard cohesion suit"
|
||||
desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
|
||||
icon_state = "cohesionsuit_hazard"
|
||||
icon_state = "cohesionsuit_hazard"
|
||||
|
||||
/obj/item/clothing/under/sexybunny_white
|
||||
name = "Bunny girl suit"
|
||||
desc = "this seems to come with extra padding, exaggerating the chest some."
|
||||
icon_state = "sexybunny_white"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
|
||||
|
||||
/obj/item/clothing/under/sexybunny_black
|
||||
name = "Bunny girl suit"
|
||||
desc = "this seems to come with extra padding, exaggerating the chest some."
|
||||
icon_state = "sexybunny_black"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
|
||||
@@ -0,0 +1,173 @@
|
||||
/obj/item/weapon/spacecasinocash
|
||||
name = "broken casino chip"
|
||||
desc = "It's worth nothing in a casino."
|
||||
gender = PLURAL
|
||||
icon = 'icons/obj/casino.dmi'
|
||||
icon_state = "spacecasinocash1"
|
||||
opacity = 0
|
||||
density = 0
|
||||
anchored = 0.0
|
||||
force = 1.0
|
||||
throwforce = 1.0
|
||||
throw_speed = 1
|
||||
throw_range = 2
|
||||
w_class = ITEMSIZE_SMALL
|
||||
var/access = list()
|
||||
access = access_crate_cash
|
||||
var/worth = 0
|
||||
|
||||
/obj/item/weapon/spacecasinocash/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/spacecasinocash))
|
||||
if(istype(W, /obj/item/weapon/spacecasinocash/ewallet)) return 0
|
||||
|
||||
var/obj/item/weapon/spacecasinocash/SC = W
|
||||
|
||||
SC.adjust_worth(src.worth)
|
||||
if(istype(user, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/h_user = user
|
||||
|
||||
h_user.drop_from_inventory(src)
|
||||
h_user.drop_from_inventory(SC)
|
||||
h_user.put_in_hands(SC)
|
||||
user << "<span class='notice'>You combine the casino chips to a stack of [SC.worth] of credits.</span>"
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/spacecasinocash/update_icon()
|
||||
overlays.Cut()
|
||||
name = "[worth] casino credit\s"
|
||||
if(worth in list(1000,500,200,100,50,20,10,1))
|
||||
icon_state = "spacecasinocash[worth]"
|
||||
desc = "It's a stack of casino chips with a combined value of [worth] credits."
|
||||
return
|
||||
var/sum = src.worth
|
||||
var/num = 0
|
||||
for(var/i in list(1000,500,200,100,50,20,10,1))
|
||||
while(sum >= i && num < 50)
|
||||
sum -= i
|
||||
num++
|
||||
var/image/banknote = image('icons/obj/casino.dmi', "spacecasinocash[i]")
|
||||
var/matrix/M = matrix()
|
||||
M.Translate(rand(-6, 6), rand(-4, 8))
|
||||
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
|
||||
banknote.transform = M
|
||||
src.overlays += banknote
|
||||
if(num == 0) // Less than one credit, let's just make it look like 1 for ease
|
||||
var/image/banknote = image('icons/obj/casino.dmi', "spacecasinocash1")
|
||||
var/matrix/M = matrix()
|
||||
M.Translate(rand(-6, 6), rand(-4, 8))
|
||||
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
|
||||
banknote.transform = M
|
||||
src.overlays += banknote
|
||||
src.desc = "They are worth [worth] of credits."
|
||||
|
||||
/obj/item/weapon/spacecasinocash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1)
|
||||
worth += adjust_worth
|
||||
if(worth > 0)
|
||||
if(update)
|
||||
update_icon()
|
||||
return worth
|
||||
else
|
||||
qdel(src)
|
||||
return 0
|
||||
|
||||
/obj/item/weapon/spacecasinocash/proc/set_worth(var/new_worth = 0, var/update = 1)
|
||||
worth = max(0, new_worth)
|
||||
if(update)
|
||||
update_icon()
|
||||
return worth
|
||||
|
||||
/obj/item/weapon/spacecasinocash/attack_self()
|
||||
var/amount = input(usr, "How much credits worth of chips do you want to take? (0 to [src.worth])", "Take chips", 20) as num
|
||||
amount = round(Clamp(amount, 0, src.worth))
|
||||
|
||||
if(!amount)
|
||||
return
|
||||
|
||||
adjust_worth(-amount)
|
||||
var/obj/item/weapon/spacecasinocash/SC = new (usr.loc)
|
||||
SC.set_worth(amount)
|
||||
usr.put_in_hands(SC)
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c1
|
||||
name = "1 credit casino chip"
|
||||
icon_state = "spacecasinocash1"
|
||||
desc = "It's worth 1 credit."
|
||||
worth = 1
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c10
|
||||
name = "10 credit casino chip"
|
||||
icon_state = "spacecasinocash10"
|
||||
desc = "It's worth 10 credits."
|
||||
worth = 10
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c20
|
||||
name = "20 credit casino chip"
|
||||
icon_state = "spacecasinocash20"
|
||||
desc = "It's worth 20 credits."
|
||||
worth = 20
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c50
|
||||
name = "50 credit casino chip"
|
||||
icon_state = "spacecasinocash50"
|
||||
desc = "It's worth 50 credits."
|
||||
worth = 50
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c100
|
||||
name = "100 credit casino chip"
|
||||
icon_state = "spacecasinocash100"
|
||||
desc = "It's worth 100 credits."
|
||||
worth = 100
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c200
|
||||
name = "200 credit casino chip"
|
||||
icon_state = "spacecasinocash200"
|
||||
desc = "It's worth 200 credits."
|
||||
worth = 200
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c500
|
||||
name = "500 credit casino chip"
|
||||
icon_state = "spacecasinocash500"
|
||||
desc = "It's worth 500 credits."
|
||||
worth = 500
|
||||
|
||||
/obj/item/weapon/spacecasinocash/c1000
|
||||
name = "1000 credit casino chip"
|
||||
icon_state = "spacecasinocash1000"
|
||||
desc = "It's worth 1000 credits."
|
||||
worth = 1000
|
||||
|
||||
proc/spawn_casinochips(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
|
||||
var/obj/item/weapon/spacecasinocash/SC = new (spawnloc)
|
||||
|
||||
SC.set_worth(sum)
|
||||
if (ishuman(human_user) && !human_user.get_active_hand())
|
||||
human_user.put_in_hands(SC)
|
||||
return
|
||||
|
||||
/obj/item/weapon/spacecasinocash/ewallet
|
||||
name = "Casino chip card"
|
||||
icon_state = "efundcard"
|
||||
desc = "A casino card that can hold credits."
|
||||
var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions.
|
||||
attack_self() return //Don't act
|
||||
attackby() return //like actual
|
||||
update_icon() return //space cash
|
||||
|
||||
/obj/item/weapon/spacecasinocash/ewallet/examine(mob/user)
|
||||
..(user)
|
||||
if (!(user in view(2)) && user!=src.loc) return
|
||||
user << "<font color='#6F6FE2'>Casino chip card's owner: [src.owner_name]. credits remaining: [src.worth].</font>"
|
||||
|
||||
/obj/item/weapon/casin_platinum_chip
|
||||
name = "platinum chip"
|
||||
desc = "Ringa-a-Ding-Ding!"
|
||||
icon = 'icons/obj/casino.dmi'
|
||||
icon_state = "platinum_chip"
|
||||
opacity = 0
|
||||
density = 0
|
||||
anchored = 0.0
|
||||
force = 1.0
|
||||
throwforce = 1.0
|
||||
throw_speed = 1
|
||||
throw_range = 2
|
||||
w_class = ITEMSIZE_SMALL
|
||||
@@ -9,15 +9,17 @@
|
||||
var/artist // Song's creator
|
||||
var/duration // Song length in deciseconds
|
||||
var/secret // Show up in regular playlist or secret playlist?
|
||||
var/casino // Music for casino jukebox
|
||||
var/lobby // Be one of the choices for lobby music?
|
||||
|
||||
/datum/track/New(var/url, var/title, var/duration, var/artist = "", var/secret = 0, var/lobby = 0)
|
||||
/datum/track/New(var/url, var/title, var/duration, var/artist = "", var/secret = 0, var/lobby = 0, var/casino = 0)
|
||||
src.url = url
|
||||
src.title = title
|
||||
src.artist = artist
|
||||
src.duration = duration
|
||||
src.secret = secret
|
||||
src.lobby = lobby
|
||||
src.casino = casino
|
||||
|
||||
/datum/track/proc/display()
|
||||
var str = "\"[title]\""
|
||||
@@ -58,6 +60,7 @@ var/global/list/all_lobby_tracks = list()
|
||||
if(istext(entry["artist"]))
|
||||
T.artist = entry["artist"]
|
||||
T.secret = entry["secret"] ? 1 : 0
|
||||
T.casino = entry["casino"] ? 1 : 0
|
||||
T.lobby = entry["lobby"] ? 1 : 0
|
||||
all_jukebox_tracks += T
|
||||
if(T.lobby)
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
"Fox" = "fox",
|
||||
"Parrot" = "parrot",
|
||||
"Rabbit" = "rabbit",
|
||||
"Bear" = "bear" //VOREStation Edit
|
||||
"Bear" = "bear", //VOREStation Edit
|
||||
"Raccoon" = "raccoon" //Chompstation Edit
|
||||
)
|
||||
|
||||
var/global/list/possible_say_verbs = list(
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
//raccoon
|
||||
/mob/living/simple_animal/raccoon
|
||||
name = "raccoon"
|
||||
desc = "A raccoon, also known as a trash panda."
|
||||
tt_desc = "E purgamentum raccoonus"
|
||||
intelligence_level = SA_ANIMAL
|
||||
icon = 'icons/mob/animal_vr.dmi'
|
||||
icon_state = "raccoon"
|
||||
item_state = "raccoon"
|
||||
icon_living = "raccoon"
|
||||
icon_dead = "raccoon_dead"
|
||||
|
||||
investigates = 1
|
||||
specific_targets = 1 //Only targets with Found()
|
||||
run_at_them = 0 //DOMESTICATED
|
||||
view_range = 5
|
||||
|
||||
turns_per_move = 5
|
||||
see_in_dark = 6
|
||||
|
||||
response_help = "pets"
|
||||
response_disarm = "gently pushes aside"
|
||||
response_harm = "kicks"
|
||||
|
||||
min_oxy = 16 //Require atleast 16kPA oxygen
|
||||
minbodytemp = 223 //Below -50 Degrees Celcius
|
||||
maxbodytemp = 323 //Above 50 Degrees Celcius
|
||||
|
||||
|
||||
speak_chance = 1
|
||||
speak = list("HSSSSS")
|
||||
speak_emote = list("purrs")
|
||||
emote_see = list("shakes their head", "shivers","grooms self", "nibbles on some trash")
|
||||
say_maybe_target = list("Hss?")
|
||||
say_got_target = list("HSSSS!","REEER!")
|
||||
|
||||
meat_amount = 1
|
||||
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
|
||||
|
||||
var/turns_since_scan = 0
|
||||
var/mob/flee_target
|
||||
|
||||
/mob/living/simple_animal/raccoon/proc/handle_flee_target()
|
||||
//see if we should stop fleeing
|
||||
if (flee_target && !(flee_target in ListTargets(view_range)))
|
||||
flee_target = null
|
||||
GiveUpMoving()
|
||||
|
||||
if (flee_target && !stat && !buckled)
|
||||
if (resting)
|
||||
lay_down()
|
||||
if(prob(25)) say("HSSSSS")
|
||||
stop_automated_movement = 1
|
||||
walk_away(src, flee_target, 7, 2)
|
||||
|
||||
/mob/living/simple_animal/raccoon/react_to_attack(var/atom/A)
|
||||
if(A == src) return
|
||||
flee_target = A
|
||||
turns_since_scan = 5
|
||||
|
||||
/mob/living/simple_animal/raccoon/ex_act()
|
||||
. = ..()
|
||||
react_to_attack(src.loc)
|
||||
@@ -56,3 +56,40 @@
|
||||
health = 100
|
||||
melee_damage_lower = 10
|
||||
melee_damage_upper = 20
|
||||
|
||||
/mob/living/simple_animal/redpanda/alt
|
||||
icon = 'icons/mob/vore48x48.dmi'
|
||||
icon_state = "wah_alt"
|
||||
icon_living = "wah_alt"
|
||||
icon_dead = "wah_alt_dead"
|
||||
|
||||
pixel_x = -7
|
||||
|
||||
/mob/living/simple_animal/redpanda/alt/waaah
|
||||
name = "waaah"
|
||||
desc = "It's a waaah! Waaaaaaaaaah!"
|
||||
tt_desc = "Ailurus waaahius"
|
||||
icon_state = "wah_altwaaah"
|
||||
icon_living = "wah_altwaaah"
|
||||
icon_dead = "wah_altwaaah_dead"
|
||||
|
||||
maxHealth = 150
|
||||
health = 150
|
||||
|
||||
response_help = "pats the"
|
||||
response_disarm = "gently pushes aside the"
|
||||
response_harm = "hits the"
|
||||
|
||||
harm_intent_damage = 5
|
||||
melee_damage_lower = 5
|
||||
melee_damage_upper = 2
|
||||
attacktext = list("bapped rapidly!")
|
||||
|
||||
turns_per_move = 1
|
||||
|
||||
speak_chance = 25
|
||||
speak = list("Waaah!",
|
||||
"Waaah?",
|
||||
"Waaaaaaaaaah!")
|
||||
emote_hear = list("wahs!","wahs even more!")
|
||||
emote_see = list("trundles around wahing","rears up onto their hind legs and wahs at everyone!")
|
||||
@@ -103,3 +103,45 @@
|
||||
chloral spawn_reagent = "chloralhydrate"
|
||||
cryoxadone spawn_reagent = "cryoxadone"
|
||||
clonexadone spawn_reagent = "clonexadone"
|
||||
|
||||
// Chems that are used but not meant for cargo supplies, at least for now.
|
||||
champagne spawn_reagent = "champagne"
|
||||
grapesoda spawn_reagent = "grapesoda"
|
||||
singulo spawn_reagent = "singulo"
|
||||
doctor_delight spawn_reagent = "doctor_delight"
|
||||
nothing spawn_reagent = "nothing"
|
||||
banana spawn_reagent = "banana"
|
||||
honey spawn_reagent = "honey"
|
||||
egg spawn_reagent = "egg"
|
||||
coco spawn_reagent = "coco"
|
||||
cherryjelly spawn_reagent = "cherryjelly"
|
||||
carrot spawn_reagent = "carrot"
|
||||
apple spawn_reagent = "apple"
|
||||
tomato spawn_reagent = "tomato"
|
||||
nutbutter spawn_reagent = "nutbutter" //ha
|
||||
soymilk spawn_reagent = "soymilk"
|
||||
grenadine spawn_reagent = "grenadine"
|
||||
gingerale spawn_reagent = "gingerale"
|
||||
royrogers spawn_reagent = "royrogers"
|
||||
patron spawn_reagent = "patron"
|
||||
goldschlager spawn_reagent = "goldschlager"
|
||||
gelatin spawn_reagent = "gelatin"
|
||||
melonliquor spawn_reagent = "melonliquor"
|
||||
bluecuracao spawn_reagent = "bluecuracao"
|
||||
thirteenloko spawn_reagent = "thirteenloko"
|
||||
deadrum spawn_reagent = "deadrum"
|
||||
sake spawn_reagent = "sake"
|
||||
acidspit spawn_reagent = "acidspit"
|
||||
amasec spawn_reagent = "amasec"
|
||||
beepsky_smash spawn_reagent = "beepsky_smash"
|
||||
atomicbomb spawn_reagent = "atomicbomb"
|
||||
nuka_cola spawn_reagent = "nuka_cola"
|
||||
threemileisland spawn_reagent = "threemileisland"
|
||||
manhattan_proj spawn_reagent = "manhattan_proj"
|
||||
psilocybin spawn_reagent = "psilocybin"
|
||||
moonshine spawn_reagent = "moonshine"
|
||||
specialwhiskey spawn_reagent = "specialwhiskey"
|
||||
unathiliquor spawn_reagent = "unathiliquor"
|
||||
winebrandy spawn_reagent = "winebrandy"
|
||||
snaps spawn_reagent = "snaps"
|
||||
|
||||
Reference in New Issue
Block a user