mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Polaris sync
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
CC.update_icon()
|
||||
overlays = list()
|
||||
string_attached = null
|
||||
user << "\blue You detach the string from the coin."
|
||||
user << "<font color='blue'>You detach the string from the coin.</font>"
|
||||
else ..()
|
||||
|
||||
/obj/item/weapon/coin/attack_self(mob/user as mob)
|
||||
|
||||
@@ -310,7 +310,7 @@
|
||||
user << "<span class='notice'>You can't anchor something to empty space. Idiot.</span>"
|
||||
return
|
||||
|
||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
|
||||
playsound(src, W.usesound, 100, 1)
|
||||
user << "<span class='notice'>You [anchored ? "un" : ""]anchor the brace.</span>"
|
||||
|
||||
anchored = !anchored
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
return
|
||||
|
||||
if(!allowed(user))
|
||||
user << "\red Access denied."
|
||||
user << "<font color='red'>Access denied.</font>"
|
||||
return
|
||||
|
||||
user.set_machine(src)
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
new /obj/item/weapon/shovel(src)
|
||||
new /obj/item/weapon/pickaxe(src)
|
||||
new /obj/item/clothing/glasses/material(src)
|
||||
new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
|
||||
new /obj/item/clothing/shoes/boots/winter/mining(src)
|
||||
|
||||
/******************************Lantern*******************************/
|
||||
|
||||
@@ -132,12 +134,12 @@
|
||||
drill_verb = "drilling"
|
||||
|
||||
/obj/item/weapon/pickaxe/borgdrill
|
||||
name = "cyborg mining drill"
|
||||
icon_state = "diamonddrill"
|
||||
name = "enhanced sonic jackhammer"
|
||||
icon_state = "jackhammer"
|
||||
item_state = "jackhammer"
|
||||
digspeed = 15
|
||||
desc = ""
|
||||
drill_verb = "drilling"
|
||||
desc = "Cracks rocks with sonic blasts. This one seems like an improved design."
|
||||
drill_verb = "hammering"
|
||||
|
||||
/*****************************Shovel********************************/
|
||||
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
usr.set_machine(src)
|
||||
src.add_fingerprint(usr)
|
||||
if(processing==1)
|
||||
usr << "\blue The machine is processing."
|
||||
usr << "<font color='blue'>The machine is processing.</font>"
|
||||
return
|
||||
if(href_list["choose"])
|
||||
chosen = href_list["choose"]
|
||||
|
||||
@@ -50,14 +50,14 @@
|
||||
..()
|
||||
if (istype(W, /obj/item/weapon/coin))
|
||||
var/obj/item/weapon/coin/C = W
|
||||
user << "\blue You add the [C.name] into the bag."
|
||||
user << "<font color='blue'>You add the [C.name] into the bag.</font>"
|
||||
usr.drop_item()
|
||||
contents += C
|
||||
if (istype(W, /obj/item/weapon/moneybag))
|
||||
var/obj/item/weapon/moneybag/C = W
|
||||
for (var/obj/O in C.contents)
|
||||
contents += O;
|
||||
user << "\blue You empty the [C.name] into the bag."
|
||||
user << "<font color='blue'>You empty the [C.name] into the bag.</font>"
|
||||
return
|
||||
|
||||
/obj/item/weapon/moneybag/Topic(href, href_list)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
/**********************Ore box**************************/
|
||||
|
||||
//Why the hell is this file called satchel_ore_boxdm.dm? -CK
|
||||
/obj/structure/ore_box
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
icon_state = "orebox0"
|
||||
@@ -19,7 +19,7 @@
|
||||
S.hide_from(usr)
|
||||
for(var/obj/item/weapon/ore/O in S.contents)
|
||||
S.remove_from_storage(O, src) //This will move the item to this item's contents
|
||||
user << "\blue You empty the satchel into the box."
|
||||
user << "<font color='blue'>You empty the satchel into the box.</font>"
|
||||
|
||||
update_ore_count()
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
set src in view(1)
|
||||
|
||||
if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
|
||||
usr << "\red You are physically incapable of emptying the ore box."
|
||||
usr << "<font color='red'>You are physically incapable of emptying the ore box.</font>"
|
||||
return
|
||||
|
||||
if( usr.stat || usr.restrained() )
|
||||
@@ -82,13 +82,13 @@
|
||||
add_fingerprint(usr)
|
||||
|
||||
if(contents.len < 1)
|
||||
usr << "\red The ore box is empty"
|
||||
usr << "<font color='red'>The ore box is empty.</font>"
|
||||
return
|
||||
|
||||
for (var/obj/item/weapon/ore/O in contents)
|
||||
contents -= O
|
||||
O.loc = src.loc
|
||||
usr << "\blue You empty the ore box"
|
||||
usr << "<font color='blue'>You empty the ore box.</font>"
|
||||
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user