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

Merge branch 'release' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
This commit is contained in:
Repede
2020-02-22 12:38:04 -05:00
parent 7fc70caa43 5ab3654a44
commit 4cf7f71be6
905 changed files with 89234 additions and 7194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/research/destructive_analyzer.dm
View File

@@ -40,10 +40,10 @@ Note: Must be placed within 3 tiles of the R&D Console
/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(busy)
user << "<span class='notice'>\The [src] is busy right now.</span>"
to_chat(user, "<span class='notice'>\The [src] is busy right now.</span>")
return
if(loaded_item)
user << "<span class='notice'>There is something already loaded into \the [src].</span>"
to_chat(user, "<span class='notice'>There is something already loaded into \the [src].</span>")
return 1
if(default_deconstruction_screwdriver(user, O))
if(linked_console)
@@ -55,25 +55,25 @@ Note: Must be placed within 3 tiles of the R&D Console
if(default_part_replacement(user, O))
return
if(panel_open)
user << "<span class='notice'>You can't load \the [src] while it's opened.</span>"
to_chat(user, "<span class='notice'>You can't load \the [src] while it's opened.</span>")
return 1
if(!linked_console)
user << "<span class='notice'>\The [src] must be linked to an R&D console first.</span>"
to_chat(user, "<span class='notice'>\The [src] must be linked to an R&D console first.</span>")
return
if(!loaded_item)
if(isrobot(user)) //Don't put your module items in there!
return
if(!O.origin_tech)
user << "<span class='notice'>This doesn't seem to have a tech origin.</span>"
to_chat(user, "<span class='notice'>This doesn't seem to have a tech origin.</span>")
return
if(O.origin_tech.len == 0)
user << "<span class='notice'>You cannot deconstruct this item.</span>"
to_chat(user, "<span class='notice'>You cannot deconstruct this item.</span>")
return
busy = 1
loaded_item = O
user.drop_item()
O.loc = src
user << "<span class='notice'>You add \the [O] to \the [src].</span>"
to_chat(user, "<span class='notice'>You add \the [O] to \the [src].</span>")
flick("d_analyzer_la", src)
spawn(10)
update_icon()

6
code/modules/research/message_server.dm
View File

@@ -142,8 +142,8 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/attack_hand(user as mob)
// user << "<font color='blue'>There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.</font>"
user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]"
// to_chat(user, "<font color='blue'>There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.</font>")
to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
active = !active
update_icon()
@@ -155,7 +155,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
spamfilter_limit += round(MESSAGE_SERVER_DEFAULT_SPAM_LIMIT / 2)
user.drop_item()
qdel(O)
user << "You install additional memory and processors into message server. Its filtering capabilities been enhanced."
to_chat(user, "You install additional memory and processors into message server. Its filtering capabilities been enhanced.")
else
..(O, user)

4
code/modules/research/server.dm
View File

@@ -168,7 +168,7 @@
add_fingerprint(usr)
usr.set_machine(src)
if(!allowed(usr) && !emagged)
usr << "<span class='warning'>You do not have the required access level</span>"
to_chat(usr, "<span class='warning'>You do not have the required access level</span>")
return
if(href_list["main"])
@@ -296,7 +296,7 @@
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "<span class='notice'>You you disable the security protocols.</span>"
to_chat(user, "<span class='notice'>You you disable the security protocols.</span>")
src.updateUsrDialog()
return 1