mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-17 10:57:19 +01:00
Replaces Mice w/ Rats (#6625)
This commit is contained in:
@@ -17,10 +17,10 @@
|
||||
icon = 'icons/mob/robots.dmi'
|
||||
icon_state = "remainsrobot"
|
||||
|
||||
/obj/effect/decal/remains/mouse
|
||||
name = "mouse skeleton"
|
||||
/obj/effect/decal/remains/rat
|
||||
name = "rat skeleton"
|
||||
desc = "Looks like the remains of a small rodent. It doesn't squeak anymore."
|
||||
icon = 'icons/mob/npc/mouse.dmi'
|
||||
icon = 'icons/mob/npc/rat.dmi'
|
||||
icon_state = "skeleton"
|
||||
|
||||
/obj/effect/decal/remains/lizard
|
||||
|
||||
@@ -1043,7 +1043,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]")))
|
||||
P.tnote.Add(list(list("sent" = 0, "owner" = "[owner]", "job" = "[ownjob]", "message" = "[t]", "target" = "\ref[src]")))
|
||||
for(var/mob/M in player_list)
|
||||
if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) // src.client is so that ghosts don't have to listen to mice
|
||||
if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) // src.client is so that ghosts don't have to listen to rats
|
||||
if(istype(M, /mob/abstract/new_player))
|
||||
continue
|
||||
M.show_message("<span class='game say'>PDA Message - <span class='name'>[owner]</span> -> <span class='name'>[P.owner]</span>: <span class='message'>[t]</span></span>")
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
w_class = 2
|
||||
matter = list("glass" = 200)
|
||||
flags = NOBLUDGEON
|
||||
var/list/accept_mobs = list(/mob/living/simple_animal/lizard, /mob/living/simple_animal/mouse)
|
||||
var/list/accept_mobs = list(/mob/living/simple_animal/lizard, /mob/living/simple_animal/rat)
|
||||
var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling
|
||||
drop_sound = 'sound/items/drop/glass.ogg'
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
"Hephaestus Industries", "Idris Incorporated", "Glorsh Omega II", "the Jargon Federation", "the People's Republic of Adhomai", "the Adhomai Liberation Army", "the Izweski Hegemony",
|
||||
"the Zo'ra Hive","the Frontier Alliance", "Digital Dingo", "Optimum Jeffrey", "Lemmy and the Clockworks", "President Hadii", "King Azunja","Supreme Commander Nated'Hakhan",
|
||||
"Lord-Regent Not'zar","Jesus Christ","Santa Claus","Mrs. Claus","Sandy Claws","Buddha","Gary","Jesus Christ!","the True Queen of Biesel, God-Lady Seon-rin von Illdenberg, First of Her Name",
|
||||
"Admiral Frost","Pirate King Frost", "The Secret NanoTrasen Cabal of Duty Officers", "The Society for the Preservation of Mice", "Officer Beepsky","Lieutenant Columbo","B.O.B","Runtime",
|
||||
"Admiral Frost","Pirate King Frost", "The Secret NanoTrasen Cabal of Duty Officers", "The Society for the Preservation of Rats", "Officer Beepsky","Lieutenant Columbo","B.O.B","Runtime",
|
||||
"Bones","Chauncey","Ian","Pun Pun","Nup Nup","Waldo","Odlaw","Crew of the NSS Exodus", "Custodial Staff of the NTCC Odin","ERT Phoenix","grey slime (357)","Bob the Blob","People for the Ethical Treatment of Bluespace Bears",
|
||||
"Mr. Clown and Mrs. Mime from New Puerto Rico","the Grinch","the Krampus","Satan","Mega-Satan","<span class='danger'>\[BENEFACTOR REDACTED]\</span>","Bluespace Cat","Union of Bluespace Technicians Tau Ceti","Robo Mickey Mouse")
|
||||
var/pick_emotion = pick("love","platonic admiration","approval","love (not in a sexual way or anything, though)","apathy", "schadenfreude","love","God's blessing","Santa's blessing","Non-demoninational deity's blessing","love","compassion","appreciation",
|
||||
@@ -260,9 +260,9 @@
|
||||
/obj/item/clothing/mask/gas/mime,
|
||||
/obj/item/clothing/shoes/galoshes,
|
||||
/mob/living/simple_animal/lizard,
|
||||
/mob/living/simple_animal/mouse/brown,
|
||||
/mob/living/simple_animal/mouse/gray,
|
||||
/mob/living/simple_animal/mouse/white,
|
||||
/mob/living/simple_animal/rat/brown,
|
||||
/mob/living/simple_animal/rat/gray,
|
||||
/mob/living/simple_animal/rat/white,
|
||||
/obj/item/weapon/xmasgift/small,
|
||||
/obj/item/weapon/tank/jetpack/void,
|
||||
/obj/item/weapon/xmasgift/large,
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_base = "small"
|
||||
icon_state = "small0"
|
||||
desc = "A small mechanical trap thas is used to catch small animals like mice, lizards, chick and spiderlings."
|
||||
desc = "A small mechanical trap thas is used to catch small animals like rats, lizards, chick and spiderlings."
|
||||
throwforce = 2
|
||||
force = 1
|
||||
w_class = 2
|
||||
@@ -145,7 +145,7 @@
|
||||
time_to_escape = 3 // Minutes
|
||||
var/breakout = FALSE
|
||||
var/last_shake = 0
|
||||
var/list/allowed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/lizard)
|
||||
var/list/allowed_mobs = list(/mob/living/simple_animal/rat, /mob/living/simple_animal/chick, /mob/living/simple_animal/lizard)
|
||||
var/release_time = 0
|
||||
var/list/resources = list(rods = 6)
|
||||
var/spider = TRUE
|
||||
@@ -157,7 +157,7 @@
|
||||
|
||||
/obj/item/weapon/trap/animal/update_icon()
|
||||
icon = initial(icon)
|
||||
icon_state = "[icon_base][deployed]"
|
||||
icon_state = "[icon_base][deployed]"
|
||||
var/datum/L = captured ? captured.resolve() : null
|
||||
if (!L)
|
||||
deployed = FALSE
|
||||
@@ -169,7 +169,7 @@
|
||||
if(isliving(L))
|
||||
var/mutable_appearance/MA = new(L)
|
||||
MA.layer = FLOAT_LAYER
|
||||
MA.plane = FLOAT_PLANE
|
||||
MA.plane = FLOAT_PLANE
|
||||
underlays.Cut()
|
||||
underlays += MA
|
||||
|
||||
@@ -196,7 +196,7 @@
|
||||
else if (istype(L, /obj/effect/spider/spiderling))
|
||||
var/obj/effect/spider/spiderling/S = L
|
||||
to_chat(user, "<span class='notice'>\The [src] has [S] and it is alive.</span>")
|
||||
|
||||
|
||||
else
|
||||
to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
explosion_resistance = 5
|
||||
var/list/mobs_can_pass = list(
|
||||
/mob/living/carbon/slime,
|
||||
/mob/living/simple_animal/mouse,
|
||||
/mob/living/simple_animal/rat,
|
||||
/mob/living/silicon/robot/drone
|
||||
)
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
src.set_dir(turn(src.dir, 90))
|
||||
return
|
||||
else
|
||||
if(istype(usr,/mob/living/simple_animal/mouse))
|
||||
if(israt(usr))
|
||||
return
|
||||
if(!usr || !isturf(usr.loc))
|
||||
return
|
||||
@@ -258,4 +258,4 @@
|
||||
add_overlay(stool_cache[cache_key])
|
||||
|
||||
else
|
||||
icon_state = initial(icon_state)
|
||||
icon_state = initial(icon_state)
|
||||
|
||||
Reference in New Issue
Block a user