cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

the span of these changes is immense (#49432)

Browse Source
This commit is contained in:
Bobbahbrown
2020-02-20 13:48:13 +01:00
committed by GitHub
parent 92bdcd0e47
commit 476399a346
17 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/dna.dm
+1 -1
View File
@@ -607,7 +607,7 @@
if(elligible_organs.len)
var/obj/item/organ/O = pick(elligible_organs)
O.Remove(src)
visible_message("<span class='danger'>[src] vomits up their [O.name]!</span>", "<span class='danger'>You vomit up your [O.name]") //no "vomit up your the heart"
visible_message("<span class='danger'>[src] vomits up their [O.name]!</span>", "<span class='danger'>You vomit up your [O.name]</span>") //no "vomit up your the heart"
O.forceMove(drop_location())
if(prob(20))
O.animate_atom_living()
code/datums/mutations/actions.dm
+2 -2
View File
@@ -342,11 +342,11 @@
chems = new
chems.transfered = embedded_mob
chems.spikey = src
to_chat(fired_by, "<span class='notice'>Link established! Use the \"Transfer Chemicals\" ability to send your chemicals to the linked target!")
to_chat(fired_by, "<span class='notice'>Link established! Use the \"Transfer Chemicals\" ability to send your chemicals to the linked target!</span>")
chems.Grant(fired_by)
/obj/item/hardened_spike/chem/unembedded()
to_chat(fired_by, "<span class='warning'>Link lost!")
to_chat(fired_by, "<span class='warning'>Link lost!</span>")
QDEL_NULL(chems)
..()
code/game/machinery/medipen_refiller.dm
+2 -2
View File
@@ -66,9 +66,9 @@
..()
/obj/machinery/medipen_refiller/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
to_chat(user, "<span class='notice'>You start furiously plunging [name].")
to_chat(user, "<span class='notice'>You start furiously plunging [name].</span>")
if(do_after(user, 30, target = src))
to_chat(user, "<span class='notice'>You finish plunging the [name].")
to_chat(user, "<span class='notice'>You finish plunging the [name].</span>")
reagents.reaction(get_turf(src), TOUCH)
reagents.clear_reagents()
code/game/mecha/mech_fabricator.dm
+1 -1
View File
@@ -65,7 +65,7 @@
/obj/machinery/mecha_part_fabricator/examine(mob/user)
. = ..()
if(in_range(user, src) || isobserver(user))
. += "<span class='notice'>The status display reads: Storing up to <b>[rmat.local_size]</b> material units.<br>Material consumption at <b>[component_coeff*100]%</b>.<br>Build time reduced by <b>[100-time_coeff*100]%</b>.<span>"
. += "<span class='notice'>The status display reads: Storing up to <b>[rmat.local_size]</b> material units.<br>Material consumption at <b>[component_coeff*100]%</b>.<br>Build time reduced by <b>[100-time_coeff*100]%</b>.</span>"
/obj/machinery/mecha_part_fabricator/emag_act()
if(obj_flags & EMAGGED)
code/game/objects/items/devices/flashlight.dm
+1 -5
View File
@@ -276,11 +276,7 @@
STOP_PROCESSING(SSobj, src)
/obj/item/flashlight/flare/ignition_effect(atom/A, mob/user)
if(fuel && on)
. = "<span class='notice'>[user] lights [A] with [src] like a real \
badass.</span>"
else
. = ""
. = fuel && on ? "<span class='notice'>[user] lights [A] with [src] like a real badass.</span>" : ""
/obj/item/flashlight/flare/proc/turn_off()
on = FALSE
code/game/objects/items/grenades/festive.dm
+2 -2
View File
@@ -89,12 +89,12 @@ obj/item/grenade/firecracker/wirecutter_act(mob/living/user, obj/item/I)
return
if(det_time)
det_time -= 10
to_chat(user, "<span class='notice'>You shorten the fuse of [src] with [I].")
to_chat(user, "<span class='notice'>You shorten the fuse of [src] with [I].</span>")
playsound(src, 'sound/items/wirecutter.ogg', 20, TRUE)
icon_state = initial(icon_state) + "_[det_time]"
update_icon()
else
to_chat(user, "<span class='danger'>You've already removed all of the fuse!")
to_chat(user, "<span class='danger'>You've already removed all of the fuse!</span>")
obj/item/grenade/firecracker/preprime(mob/user, delayoverride, msg = TRUE, volume = 80)
var/turf/T = get_turf(src)
code/game/objects/items/pneumaticCannon.dm
+1 -1
View File
@@ -174,7 +174,7 @@
fire_items(T, user)
if(pressureSetting >= 3 && iscarbon(user))
var/mob/living/carbon/C = user
C.visible_message("<span class='warning'>[C] is thrown down by the force of the cannon!</span>", "<span class='userdanger'>[src] slams into your shoulder, knocking you down!")
C.visible_message("<span class='warning'>[C] is thrown down by the force of the cannon!</span>", "<span class='userdanger'>[src] slams into your shoulder, knocking you down!</span>")
C.Paralyze(60)
/obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user)
code/modules/antagonists/abductor/equipment/abduction_gear.dm
+2 -4
View File
@@ -373,10 +373,8 @@
/obj/item/firing_pin/abductor
name = "alien firing pin"
icon_state = "firing_pin_ayy"
desc = "This firing pin is slimy and warm; you can swear you feel it \
constantly trying to mentally probe you."
fail_message = "<span class='abductor'>\
Firing error, please contact Command.</span>"
desc = "This firing pin is slimy and warm; you can swear you feel it constantly trying to mentally probe you."
fail_message = "<span class='abductor'>Firing error, please contact Command.</span>"
/obj/item/firing_pin/abductor/pin_auth(mob/living/user)
. = isabductor(user)
code/modules/assembly/igniter.dm
+1 -2
View File
@@ -39,7 +39,6 @@
add_fingerprint(user)
/obj/item/assembly/igniter/ignition_effect(atom/A, mob/user)
. = "<span class='notice'>[user] fiddles with [src], and manages to \
light [A].</span>"
. = "<span class='notice'>[user] fiddles with [src], and manages to light [A].</span>"
activate()
add_fingerprint(user)
code/modules/atmospherics/machinery/atmosmachinery.dm
+2 -2
View File
@@ -301,7 +301,7 @@
if(target_move.can_crawl_through())
if(is_type_in_typecache(target_move, GLOB.ventcrawl_machinery))
user.forceMove(target_move.loc) //handle entering and so on.
user.visible_message("<span class='notice'>You hear something squeezing through the ducts...</span>", "<span class='notice'>You climb out the ventilation system.")
user.visible_message("<span class='notice'>You hear something squeezing through the ducts...</span>", "<span class='notice'>You climb out the ventilation system.</span>")
else
var/list/pipenetdiff = returnPipenets() ^ target_move.returnPipenets()
if(pipenetdiff.len)
@@ -313,7 +313,7 @@
playsound(src, 'sound/machines/ventcrawl.ogg', 50, TRUE, -3)
else if(is_type_in_typecache(src, GLOB.ventcrawl_machinery) && can_crawl_through()) //if we move in a way the pipe can connect, but doesn't - or we're in a vent
user.forceMove(loc)
user.visible_message("<span class='notice'>You hear something squeezing through the ducts...</span>", "<span class='notice'>You climb out the ventilation system.")
user.visible_message("<span class='notice'>You hear something squeezing through the ducts...</span>", "<span class='notice'>You climb out the ventilation system.</span>")
//PLACEHOLDER COMMENT FOR ME TO READD THE 1 (?) DS DELAY THAT WAS IMPLEMENTED WITH A... TIMER?
code/modules/events/immovable_rod.dm
+1 -2
View File
@@ -127,8 +127,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
penetrate(clong)
else if(istype(clong, type))
var/obj/effect/immovablerod/other = clong
visible_message("<span class='danger'>[src] collides with [other]!\
</span>")
visible_message("<span class='danger'>[src] collides with [other]!</span>")
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(2, get_turf(src))
smoke.start()
code/modules/plumbing/plumbers/_plumb_machinery.dm
+2 -2
View File
@@ -41,9 +41,9 @@
return TRUE
/obj/machinery/plumbing/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
to_chat(user, "<span class='notice'>You start furiously plunging [name].")
to_chat(user, "<span class='notice'>You start furiously plunging [name].</span>")
if(do_after(user, 30, target = src))
to_chat(user, "<span class='notice'>You finish plunging the [name].")
to_chat(user, "<span class='notice'>You finish plunging the [name].</span>")
reagents.reaction(get_turf(src), TOUCH) //splash on the floor
reagents.clear_reagents()
code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+1 -1
View File
@@ -344,7 +344,7 @@
//Has to be at less than TRESHOLD_UNHUSK burn damage and have 100 isntabitaluri before unhusking. Corpses dont metabolize.
if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && Carbies.getFireLoss() < TRESHOLD_UNHUSK && Carbies.reagents.has_reagent(/datum/reagent/medicine/C2/instabitaluri, 100))
Carbies.cure_husk("burn")
Carbies.visible_message("<span class='nicegreen'>With most of the burnt off flesh replaced, [Carbies] looks a lot healthier.")
Carbies.visible_message("<span class='nicegreen'>With most of the burnt off flesh replaced, [Carbies] looks a lot healthier.</span>")
..()
return TRUE
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+1 -1
View File
@@ -205,7 +205,7 @@
var/mob/living/carbon/patient = M
if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < TRESHOLD_UNHUSK) //One carp yields 12u rezadone.
patient.cure_husk("burn")
patient.visible_message("<span class='nicegreen'>[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance.")
patient.visible_message("<span class='nicegreen'>[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance.</span>")
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"
code/modules/reagents/reagent_containers/maunamug.dm
+1 -1
View File
@@ -19,7 +19,7 @@
. = ..()
. += "<span class='notice'>The status display reads: Current temperature: <b>[reagents.chem_temp]K</b> Current Charge:[cell ? "[cell.charge / cell.maxcharge * 100]%" : "No cell found"].</span>"
if(open)
. += "<span class='notice'The battery case is open.</span>"
. += "<span class='notice'>The battery case is open.</span>"
/obj/item/reagent_containers/glass/maunamug/process()
..()
code/modules/research/experimentor.dm
+2 -2
View File
@@ -522,10 +522,10 @@
use_power(500000)
investigate_log("Experimentor has drained power from its APC", INVESTIGATE_EXPERIMENTOR)
if(globalMalf == 99)
visible_message("<span class='warning'>[src] begins to glow and vibrate. It's going to blow!")
visible_message("<span class='warning'>[src] begins to glow and vibrate. It's going to blow!</span>")
addtimer(CALLBACK(src, .proc/boom), 50)
if(globalMalf == 100)
visible_message("<span class='warning'>[src] begins to glow and vibrate. It's going to blow!")
visible_message("<span class='warning'>[src] begins to glow and vibrate. It's going to blow!</span>")
addtimer(CALLBACK(src, .proc/honk), 50)
addtimer(CALLBACK(src, .proc/reset_exp), resetTime)
code/modules/vending/_vending.dm
+3 -3
View File
@@ -546,8 +546,8 @@ GLOBAL_LIST_EMPTY(vending_products)
throw_at(get_turf(fatty), 1, 1, spin=FALSE)
/obj/machinery/vending/proc/untilt(mob/user)
user.visible_message("<span class='notice'>[user] rights [src].", \
"<span class='notice'>You right [src].")
user.visible_message("<span class='notice'>[user] rights [src].</span>", \
"<span class='notice'>You right [src].</span>")
unbuckle_all_mobs(TRUE)
@@ -638,7 +638,7 @@ GLOBAL_LIST_EMPTY(vending_products)
return
if(tilted && !user.buckled && !isAI(user))
to_chat(user, "<span class='notice'>You begin righting [src].")
to_chat(user, "<span class='notice'>You begin righting [src].</span>")
if(do_after(user, 50, target=src))
untilt(user)
return