shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alien Ruin fix, various cherrypicked upstream fixes

Browse Source 
Also adds new buildmode
This commit is contained in:
Poojawa
2018-09-13 22:55:11 -05:00
parent 46e805af28
commit 42db44b39e
63 changed files with 3437 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/computers/logbrowser.dm
+31 -40
View File
@@ -62,72 +62,63 @@
// If the log is a speech file
if(C.input_type == "Speech File")
dat += "<li><font color = #008F00>[C.name]</font color> <font color = #FF0000><a href='?src=[REF(src)];delete=[i]'>\[X\]</a></font color><br>"
dat += "<li><font color = #008F00>[C.name]</font> <font color = #FF0000><a href='?src=[REF(src)];delete=[i]'>\[X\]</a></font><br>"
// -- Determine race of orator --
var/race // The actual race of the mob
var/language = "Human" // MMIs, pAIs, Cyborgs and humans all speak Human
var/mobtype = C.parameters["mobtype"]
var/race // The actual race of the mob
var/list/humans = typesof(/mob/living/carbon/human, /mob/living/brain)
var/list/monkeys = typesof(/mob/living/carbon/monkey)
var/list/silicons = typesof(/mob/living/silicon)
var/list/slimes = typesof(/mob/living/simple_animal/slime)
var/list/animals = typesof(/mob/living/simple_animal)
if(mobtype in humans)
if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain))
race = "Humanoid"
language = race
else if(mobtype in slimes) // NT knows a lot about slimes, but not aliens. Can identify slimes
// NT knows a lot about slimes, but not aliens. Can identify slimes
else if(ispath(mobtype, /mob/living/simple_animal/slime))
race = "Slime"
language = race
else if(mobtype in monkeys)
else if(ispath(mobtype, /mob/living/carbon/monkey))
race = "Monkey"
language = race
else if(mobtype in silicons || C.parameters["job"] == "AI") // sometimes M gets deleted prematurely for AIs... just check the job
// sometimes M gets deleted prematurely for AIs... just check the job
else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI")
race = "Artificial Life"
language = "Humanoid" //Ais and borgs speak human, and binary isnt picked up.
else if(isobj(mobtype))
race = "Machinery"
language = race
else if(mobtype in animals)
else if(ispath(mobtype, ))
race = "Domestic Animal"
language = race
else
race = "<i>Unidentifiable</i>"
language = race
// -- If the orator is a human, or universal translate is active, OR mob has universal speech on --
dat += "<u><font color = #18743E>Data type</font></u>: [C.input_type]<br>"
dat += "<u><font color = #18743E>Source</font></u>: [C.parameters["name"]] (Job: [C.parameters["job"]])<br>"
dat += "<u><font color = #18743E>Class</font></u>: [race]<br>"
var/message = C.parameters["message"]
var/language = C.parameters["language"]
if(language == "Humanoid" || universal_translate || C.parameters["uspeech"])
dat += "<u><font color = #18743E>Data type</font color></u>: [C.input_type]<br>"
dat += "<u><font color = #18743E>Source</font color></u>: [C.parameters["name"]] (Job: [C.parameters["job"]])<br>"
dat += "<u><font color = #18743E>Class</font color></u>: [race]<br>"
dat += "<u><font color = #18743E>Contents</font color></u>: \"[C.parameters["message"]]\"<br>"
// -- Orator is not human and universal translate not active --
else
dat += "<u><font color = #18743E>Data type</font color></u>: Audio File<br>"
dat += "<u><font color = #18743E>Source</font color></u>: <i>Unidentifiable</i><br>"
dat += "<u><font color = #18743E>Class</font color></u>: [race]<br>"
dat += "<u><font color = #18743E>Contents</font color></u>: <i>Unintelligible</i><br>"
// based on [/atom/movable/proc/lang_treat]
if (universal_translate || user.has_language(language))
message = "\"[message]\""
else if (!user.has_language(language))
var/datum/language/D = GLOB.language_datum_instances[language]
message = "\"[D.scramble(message)]\""
else if (language)
message = "<i>(unintelligible)</i>"
dat += "<u><font color = #18743E>Contents</font></u>: [message]<br>"
dat += "</li><br>"
else if(C.input_type == "Execution Error")
dat += "<li><font color = #990000>[C.name]</font> <a href='?src=[REF(src)];delete=[i]'>\[X\]</a><br>"
dat += "<u><font color = #787700>Error</font></u>: \"[C.parameters["message"]]\"<br>"
dat += "</li><br>"
dat += "<li><font color = #990000>[C.name]</font color> <font color = #FF0000><a href='?src=[REF(src)];delete=[i]'>\[X\]</a></font color><br>"
dat += "<u><font color = #787700>Output</font color></u>: \"[C.parameters["message"]]\"<br>"
else
dat += "<li><font color = #000099>[C.name]</font> <a href='?src=[REF(src)];delete=[i]'>\[X\]</a><br>"
dat += "<u><font color = #18743E>Data type</font></u>: [C.input_type]<br>"
dat += "<u><font color = #18743E>Contents</font></u>: <i>(unintelligible)</i><br>"
dat += "</li><br>"
@@ -221,4 +212,4 @@
/obj/machinery/computer/telecomms/server/attackby()
. = ..()
updateUsrDialog()
updateUsrDialog()
code/game/machinery/telecomms/machines/server.dm
+1
View File
@@ -36,6 +36,7 @@
log.parameters["name"] = signal.data["name"]
log.parameters["job"] = signal.data["job"]
log.parameters["message"] = signal.data["message"]
log.parameters["language"] = signal.language
// If the signal is still compressed, make the log entry gibberish
var/compression = signal.data["compression"]
code/game/mecha/equipment/tools/mining_tools.dm
+2 -4
View File
@@ -79,10 +79,8 @@
/turf/open/floor/plating/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
for(var/turf/open/floor/plating/asteroid/M in range(1, drill.chassis))
if(get_dir(drill.chassis,M)&drill.chassis.dir)
for(var/I in GetComponents(/datum/component/archaeology))
var/datum/component/archaeology/archy = I
archy.gets_dug()
if((get_dir(drill.chassis,M)&drill.chassis.dir) && !M.dug)
M.getDug()
drill.log_message("Drilled through [src]")
drill.move_ores()
code/game/objects/items/clown_items.dm
+2 -3
View File
@@ -62,7 +62,6 @@
return
//I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
if(user.client && ((target in user.client.screen) && !user.is_holding(target)))
to_chat(user, "<span class='warning'>You need to take that [target.name] off before cleaning it!</span>")
else if(istype(target, /obj/effect/decal/cleanable))
@@ -89,7 +88,7 @@
var/obj/effect/decal/cleanable/C = locate() in target
qdel(C)
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
target.wash_cream()
return
@@ -169,4 +168,4 @@
name = "Canned Laughter"
desc = "Just looking at this makes you want to giggle."
icon_state = "laughter"
list_reagents = list("laughter" = 50)
list_reagents = list("laughter" = 50)
code/game/objects/items/stacks/medical.dm
+14 -12
View File
@@ -127,17 +127,19 @@
self_delay = 20
max_amount = 12
/obj/item/stack/medical/gauze/wirecutter_act(mob/living/user, obj/item/I)
if(get_amount() < 2)
to_chat(user, "<span class='warning'>You need at least two gauze to do this!</span>")
return
new /obj/item/stack/sheet/cloth(user.drop_location())
user.visible_message("[user] cuts [src] into pieces of cloth with [I].", \
"<span class='notice'>You cut [src] into pieces of cloth with [I].</span>", \
"<span class='italics'>You hear cutting.</span>")
var/obj/item/stack/medical/gauze/R = src
src = null
R.use(2)
/obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/wirecutters) || I.is_sharp())
if(get_amount() < 2)
to_chat(user, "<span class='warning'>You need at least two gauzes to do this!</span>")
return
new /obj/item/stack/sheet/cloth(user.drop_location())
user.visible_message("[user] cuts [src] into pieces of cloth with [I].", \
"<span class='notice'>You cut [src] into pieces of cloth with [I].</span>", \
"<span class='italics'>You hear cutting.</span>")
use(2)
else
return ..()
/obj/item/stack/medical/gauze/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!</span>")
@@ -168,4 +170,4 @@
/obj/item/stack/medical/ointment/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?</span>")
return TOXLOSS
return TOXLOSS
code/game/turfs/open.dm
-3
View File
@@ -4,7 +4,6 @@
var/postdig_icon_change = FALSE
var/postdig_icon
var/list/archdrops
var/wet
var/footstep = null
@@ -13,8 +12,6 @@
. = ..()
if(wet)
AddComponent(/datum/component/wet_floor, wet, INFINITY, 0, INFINITY, TRUE)
if(LAZYLEN(archdrops))
AddComponent(/datum/component/archaeology, archdrops)
/turf/open/indestructible
name = "floor"
code/game/turfs/simulated/floor/plating/asteroid.dm
+37 -12
View File
@@ -13,8 +13,9 @@
var/environment_type = "asteroid"
var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
var/floor_variance = 20 //probability floor has a different icon state
archdrops = list(/obj/item/stack/ore/glass = list(ARCH_PROB = 100,ARCH_MAXDROP = 5))
attachment_holes = FALSE
var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt
var/dug
/turf/open/floor/plating/asteroid/Initialize()
var/proper_name = name
@@ -23,6 +24,14 @@
if(prob(floor_variance))
icon_state = "[environment_type][rand(0,12)]"
/turf/open/floor/plating/asteroid/proc/getDug()
new digResult(src, 5)
if(postdig_icon_change)
if(!postdig_icon)
icon_plating = "[environment_type]_dug"
icon_state = "[environment_type]_dug"
dug = TRUE
/turf/open/floor/plating/asteroid/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
@@ -36,11 +45,26 @@
return
/turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
if(..())
return TRUE
if(istype(W, /obj/item/storage/bag/ore))
for(var/obj/item/stack/ore/O in src)
SEND_SIGNAL(W, COMSIG_PARENT_ATTACKBY, O)
. = ..()
if(!.)
if(W.tool_behaviour == TOOL_SHOVEL || W.tool_behaviour == TOOL_MINING)
if(dug)
to_chat(user, "<span class='notice'>Looks like someone has dug here already.</span>")
return TRUE
if(!isturf(user.loc))
return
to_chat(user, "<span class='notice'>You start digging...</span>")
if(W.use_tool(src, user, 40, volume=50))
to_chat(user, "<span class='notice'>You dig a hole.</span>")
getDug()
SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type)
return TRUE
else if(istype(W, /obj/item/storage/bag/ore))
for(var/obj/item/stack/ore/O in src)
SEND_SIGNAL(W, COMSIG_PARENT_ATTACKBY, O)
/turf/open/floor/plating/asteroid/singularity_act()
if(is_planet_level(z))
@@ -61,8 +85,8 @@
icon_state = "basalt"
icon_plating = "basalt"
environment_type = "basalt"
archdrops = list(/obj/item/stack/ore/glass/basalt = list(ARCH_PROB = 100,ARCH_MAXDROP = 5))
floor_variance = 15
digResult = /obj/item/stack/ore/glass/basalt
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
baseturfs = /turf/open/lava/smooth
@@ -73,9 +97,10 @@
/turf/open/floor/plating/asteroid/basalt/Initialize()
. = ..()
set_basalt_light(src)
GET_COMPONENT(arch, /datum/component/archaeology)
ASSERT(isnull(arch.callback))
arch.callback = CALLBACK(src, /atom/proc/set_light, 0)
/turf/open/floor/plating/asteroid/getDug()
set_light(0)
return ..()
/proc/set_basalt_light(turf/open/floor/B)
switch(B.icon_state)
@@ -276,10 +301,10 @@
environment_type = "snow"
flags_1 = NONE
planetary_atmos = TRUE
archdrops = list(/obj/item/stack/sheet/mineral/snow = list(ARCH_PROB = 100, ARCH_MAXDROP = 5))
burnt_states = list("snow_dug")
bullet_sizzle = TRUE
bullet_bounce_sound = null
digResult = /obj/item/stack/sheet/mineral/snow
/turf/open/floor/plating/asteroid/snow/burn_tile()
if(!burnt)
@@ -312,4 +337,4 @@
/turf/open/floor/plating/asteroid/snow/atmosphere
initial_gas_mix = "o2=22;n2=82;TEMP=180"
planetary_atmos = FALSE
planetary_atmos = FALSE