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

[MIRROR] ports a bunch of grep checks from TG (#10361)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-12 11:09:38 +01:00
committed by GitHub
co-authored by Kashargul Cameron Lennox
parent 21031b169b
commit 3cfc33bfde
196 changed files with 627 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/lum_ch.dm
+1 -1
View File
@@ -1,4 +1,4 @@
//Luma coefficients suggested for HDTVs. If you change these, make sure they add up to 1.
#define LUMA_R 0.213
#define LUMA_G 0.715
#define LUMA_B 0.072
#define LUMA_B 0.072
code/__defines/mobs_yw.dm
+1 -1
View File
@@ -1,2 +1,2 @@
#define SPECIES_SHADEKIN_YW "GeneShadekin"
#define SPECIES_GREY_YW "Grey"
#define SPECIES_GREY_YW "Grey"
code/__defines/server_tools.config.dm
+1 -1
View File
@@ -5,4 +5,4 @@
#define SERVER_TOOLS_WORLD_ANNOUNCE(message) to_chat(world, "<span class='boldannounce'>[html_encode(##message)]</span>")
#define SERVER_TOOLS_LOG(message) log_world("SERVICE: [##message]")
#define SERVER_TOOLS_NOTIFY_ADMINS(event) message_admins(##event)
#define SERVER_TOOLS_CLIENT_COUNT player_list.len
#define SERVER_TOOLS_CLIENT_COUNT player_list.len
code/__defines/server_tools.dm
+1 -1
View File
@@ -98,4 +98,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
*/
code/_helpers/widelists_ch.dm
+1 -1
View File
@@ -22,4 +22,4 @@ GLOBAL_LIST_EMPTY(widelists)
p2 = "[input_list[item]]"
string += "[p1]::--::[p2]::;;;"
return md5(string)
return md5(string)
code/_onclick/cyborg.dm
+1 -1
View File
@@ -73,7 +73,7 @@
W.attack_self(src)
return
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
if(A == loc || (A in loc) || (A in contents))
// No adjacency checks
code/_onclick/hud/screen_objects_ch.dm
-1
View File
@@ -28,4 +28,3 @@
object_overlays += item_overlay
add_overlay(object_overlays)
code/controllers/configuration_yw.dm
+1 -1
View File
@@ -50,4 +50,4 @@
serverip = _serverip
servername = _servername
serverauth = _serverauth
serverauth = _serverauth
code/controllers/subsystems/discord.dm
+1 -1
View File
@@ -32,4 +32,4 @@
/proc/send2adminchat(category, message)
category = replacetext(replacetext(category, "\proper", ""), "\improper", "")
message = replacetext(replacetext(message, "\proper", ""), "\improper", "")
world.TgsTargetedChatBroadcast("[category] | [message]", TRUE)
world.TgsTargetedChatBroadcast("[category] | [message]", TRUE)
code/controllers/subsystems/garbage.dm
+3 -3
View File
@@ -51,14 +51,14 @@ SUBSYSTEM_DEF(garbage)
#ifdef REFERENCE_TRACKING
var/list/reference_find_on_fail = list()
var/find_reference_on_fail_global_toggle = FALSE
// CHOMPEdit start - unique to us
#ifdef REFERENCE_TRACKING_DEBUG
#ifdef REFERENCE_TRACKING_DEBUG
//Should we save found refs. Used for unit testing
var/should_save_refs = FALSE
#endif
//ChompEDIT END
#endif
code/datums/api.dm
+1 -1
View File
@@ -62,4 +62,4 @@ var/list/topic_commands_names = list()
/client
var/received_discord_pm
var/discord_admin
var/discord_admin
code/datums/autolathe/arms_yw.dm
+1 -1
View File
@@ -10,4 +10,4 @@
/datum/category_item/autolathe/arms/shotgun_drum_empty
name = "shotgun 12g drum magazine (Empty)"
path =/obj/item/ammo_magazine/m12gdrumjack/empty
path =/obj/item/ammo_magazine/m12gdrumjack/empty
code/datums/autolathe/tools_yw.dm
+1 -1
View File
@@ -4,4 +4,4 @@
/datum/category_item/autolathe/tools/shovel
name = "shovel"
path =/obj/item/shovel
path =/obj/item/shovel
code/datums/elements/turf_transparency.dm
+1 -1
View File
@@ -82,5 +82,5 @@
var/mutable_appearance/underlay_appearance = mutable_appearance(initial(path.icon), do_state, layer = TURF_LAYER-0.02, plane = do_plane)
underlay_appearance.appearance_flags = RESET_ALPHA | RESET_COLOR
our_turf.underlays += underlay_appearance
return TRUE
code/datums/looping_sounds/environment_sounds.dm
+1 -1
View File
@@ -25,4 +25,4 @@
volume = 40
volume_chan = VOLUME_CHANNEL_AMBIENCE
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
code/datums/outfits/pirates.dm
+1 -1
View File
@@ -30,4 +30,4 @@
l_pocket = /obj/item/ammo_magazine/clip/c762
r_pocket = /obj/item/ammo_magazine/clip/c762
var/faction = "voxpirate"
var/faction = "voxpirate"
code/datums/supplypacks/materials_yw.dm
+1 -1
View File
@@ -11,4 +11,4 @@
/obj/fiftyspawner/gaycarpet,
/obj/fiftyspawner/purcarpet,
/obj/fiftyspawner/oracarpet
) //REEE
) //REEE
code/datums/supplypacks/misc_yw.dm
+2 -2
View File
@@ -13,7 +13,7 @@
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Blueshield equipment"
access = access_blueshield_exclusive
/datum/supply_pack/misc/blueshieldweapons
name = "Blueshield Weapon Kits"
contains = list(
@@ -32,4 +32,4 @@
)
cost = 75
containertype = /obj/structure/closet/crate
containername = "Bluespace Radio Packs"
containername = "Bluespace Radio Packs"
code/datums/supplypacks/security_yw.dm
+1 -1
View File
@@ -6,4 +6,4 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/gear
containername = "Loyalty Implants Lockbox crate"
access = access_heads
access = access_heads
code/datums/uplink/uplink_items.dm
+1 -1
View File
@@ -8,7 +8,7 @@ var/datum/uplink/uplink = new()
/datum/uplink/New(var/type)
items_assoc = list()
items = init_subtypes(/datum/uplink_item)
categories = init_subtypes(/datum/uplink_category)
categories = init_subtypes(/datum/uplink_category)
categories = dd_sortedObjectList(categories)
for(var/datum/uplink_item/item in items)
code/datums/vending/stored_item.dm
+3 -3
View File
@@ -85,15 +85,15 @@
/datum/stored_item/stack/get_product(var/product_location, var/count)
if(!LAZYLEN(instances))
return null // Shouldn't happen, but will loudly complain if it breaks
var/obj/item/stack/S = instances[1]
count = min(count, S.get_max_amount())
src.amount -= count // We won't vend more than one full stack per call
// Case 1: Draw the full amount from the first instance
if(count < S.get_amount())
S = S.split(count)
// Case 2: Amount at least one stack, or have to accumulate
else if(count >= S.get_amount())
count -= S.get_amount()
code/game/gamemodes/endgame/supermatter_cascade/blob.dm
+1 -1
View File
@@ -117,4 +117,4 @@
if(istype(user,/mob/observer))
return
qdel(user)
qdel(user)
code/game/gamemodes/meteor/meteors.dm
+1 -1
View File
@@ -342,4 +342,4 @@
/obj/effect/meteor/tunguska/Bump()
..()
if(prob(20))
explosion(src.loc,2,4,6,8)
explosion(src.loc,2,4,6,8)
code/game/jobs/job/blueshield_ch.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/datum/job/blueshield
whitelist_only = 1
latejoin_only = 1
latejoin_only = 1
code/game/machinery/doors/airlock_yw.dm
+1 -1
View File
@@ -89,4 +89,4 @@
req_one_access = list(access_heads_vault, access_blueshield)
/obj/machinery/door/window/brigdoor
req_access = list(access_security, access_blueshield)
req_access = list(access_security, access_blueshield)
code/game/machinery/jukebox_ch.dm
+1 -1
View File
@@ -9,4 +9,4 @@
use_power = USE_POWER_OFF
/obj/machinery/media/jukebox/casinojukebox/getTracksList()
return SSmedia_tracks.casino_tracks
return SSmedia_tracks.casino_tracks
code/game/machinery/requests_console_vr.dm
+1 -1
View File
@@ -95,4 +95,4 @@
name = "Head of personnel RC"
department = "Head of Personnel's Desk"
departmentType = RC_ASSIST|RC_INFO
announcementConsole = 1
announcementConsole = 1
code/game/machinery/suit_storage_unit_yw.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/obj/machinery/suit_cycler/prototype
req_access = list(access_hos)
req_access = list(access_hos)
code/game/mecha/combat/phazon.dm
+1 -1
View File
@@ -19,7 +19,7 @@
max_equip = 4
//Chompedit start
max_hull_equip = 2
max_hull_equip = 2
max_weapon_equip = 2
max_utility_equip = 3
max_universal_equip = 2
code/game/mecha/mecha_wreckage_ch.dm
+1 -1
View File
@@ -13,4 +13,4 @@
/obj/item/mecha_parts/part/scarab_right_legs,
/obj/item/stack/material/plasteel,
/obj/item/stack/material/steel,
/obj/item/stack/rods)
/obj/item/stack/rods)
code/game/mecha/micro/mechfab_designs_vr.dm
+1 -1
View File
@@ -185,5 +185,5 @@
name = "Weasel Head"
id = "weasel_head"
build_path = /obj/item/mecha_parts/micro/part/weasel_head
materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500)
materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500)
*/
code/game/objects/effects/blockers_yw.dm
+1 -1
View File
@@ -9,4 +9,4 @@
/obj/effect/mobblocker/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_mob))
return FALSE
return TRUE
return TRUE
code/game/objects/effects/decals/posters/bs12.dm
-1
View File
@@ -346,4 +346,3 @@
name = "space carp information poster"
desc = "This poster showcases an old spacer saying on the dangers of migrant space carp."
listing_name = "Safety - Carp Information"
code/game/objects/effects/landmarks_vr.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effect/landmark
var/abductor = 0
code/game/objects/items/devices/radio/encryptionkey_yw.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/encryptionkey/heads/blueshield
name = "blueshield's encryption key"
icon_state = "hos_cypherkey"
channels = list("Security" = 1, "Command" = 1)
channels = list("Security" = 1, "Command" = 1)
code/game/objects/items/devices/radio/headset_yw.dm
+1 -1
View File
@@ -2,4 +2,4 @@
name = "Blueshield headset"
desc = "The headset of the man who protects command's worthless lifes."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/blueshield
ks2type = /obj/item/encryptionkey/heads/blueshield
code/game/objects/items/devices/radio/radio_yw.dm
+1 -1
View File
@@ -4,4 +4,4 @@
/obj/item/radio/bluespacehandset/linked/cryogaia_prelinked
bs_tx_preload_id = "cryogaia_rx" //Transmit to a receiver
bs_rx_preload_id = "cryogaia_tx" //Recveive from a transmitter
bs_rx_preload_id = "cryogaia_tx" //Recveive from a transmitter
code/game/objects/items/devices/starcaster_ch.dm
+2 -2
View File
@@ -27,7 +27,7 @@
/obj/item/starcaster_news/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "StarcasterCh", name)
ui = new(user, src, "StarcasterCh", name)
ui.open()
/obj/item/starcaster_news/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) //Mostly ripped off from news_browser.dm
@@ -125,4 +125,4 @@
ui.auto_update_layout = 1
ui.set_initial_data(data)
ui.open()
*/
*/
code/game/objects/items/paintkit.dm
+1 -1
View File
@@ -330,4 +330,4 @@
name = "\"Gaoler\" Gygax customisation kit"
new_name = "Durand \"Gaoler\""
new_desc = "A bulky silver Gygax exosuit. The extra armour appears to be painted on, but it's very shiny."
new_icon = "recitence"
new_icon = "recitence"
code/game/objects/items/stacks/medical.dm
+66 -66
View File
@@ -17,16 +17,16 @@
/obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
if (!istype(M))
balloon_alert(user, "\The [src] cannot be applied to [M]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] cannot be applied to [M]!") // CHOMPEdit - Balloon Alerts
return 1
if (!user.IsAdvancedToolUser())
balloon_alert(user, "You don't have the dexterity to do this!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you don't have the dexterity to do this!") // CHOMPEdit - Balloon Alerts
return 1
var/available = get_amount()
if(!available)
balloon_alert(user, "Not enough [uses_charge ? "charge" : "items"] left to use that!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "not enough [uses_charge ? "charge" : "items"] left to use that!") // CHOMPEdit - Balloon Alerts
return 1
if (ishuman(M))
@@ -34,24 +34,24 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(!affecting)
balloon_alert(user, "No body part there to work on!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "no body part there to work on!") // CHOMPEdit - Balloon Alerts
return 1
if(affecting.organ_tag == BP_HEAD)
if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
balloon_alert(user, "You can't apply [src] through [H.head]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you can't apply [src] through [H.head]!") // CHOMPEdit - Balloon Alerts
return 1
else
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
balloon_alert(user, "You can't apply [src] through [H.wear_suit]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you can't apply [src] through [H.wear_suit]!") // CHOMPEdit - Balloon Alerts
return 1
if(affecting.robotic == ORGAN_ROBOT)
balloon_alert(user, "This isn't useful at all on a robotic limb.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "this isn't useful at all on a robotic limb.") // CHOMPEdit - Balloon Alerts
return 1
if(affecting.robotic >= ORGAN_LIFELIKE)
balloon_alert(user, "You apply the [src], but it seems to have no effect...") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you apply the [src], but it seems to have no effect...") // CHOMPEdit - Balloon Alerts
use(1)
return 1
@@ -62,7 +62,7 @@
M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
user.balloon_alert_visible( \
"[M] has been applied with [src] by [user].", \
"You apply \the [src] to [M]." \
"you apply \the [src] to [M]." \
)
use(1)
@@ -99,7 +99,7 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "The [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts
return
if(affecting.is_bandaged())
@@ -107,8 +107,8 @@
return 1
else
var/available = get_amount()
user.balloon_alert_visible("\The [user] starts bandaging [M]'s [affecting.name].", \
"Bandaging [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] starts bandaging [M]'s [affecting.name].", \
"bandaging [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
var/used = 0
for (var/datum/wound/W in affecting.wounds)
if(W.internal)
@@ -118,7 +118,7 @@
if(used == amount)
break
if(!do_mob(user, M, W.damage/3, exclusive = TRUE))
balloon_alert(user, "Stand still to bandage wounds.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "stand still to bandage wounds.") // CHOMPEdit - Balloon Alerts
break
if(affecting.is_bandaged()) // We do a second check after the delay, in case it was bandaged after the first check.
@@ -126,24 +126,24 @@
return 1
if(used >= available)
balloon_alert(user, "You run out of [src]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you run out of [src]!") // CHOMPEdit - Balloon Alerts
break
if (W.current_stage <= W.max_bleeding_stage)
user.balloon_alert_visible("\The [user] bandages \a [W.desc] on [M]'s [affecting.name].", \
"You bandage \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] bandages \a [W.desc] on [M]'s [affecting.name].", \
"you bandage \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\The [user] places a bandage over \a [W.desc] on [M]'s [affecting.name].", \
"You place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] places a bandage over \a [W.desc] on [M]'s [affecting.name].", \
"you place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
W.bandage()
playsound(src, pick(apply_sounds), 25)
used++
affecting.update_damages()
if(used == amount)
if(affecting.is_bandaged())
balloon_alert(user, "\The [src] is used up.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] is used up.") // CHOMPEdit - Balloon Alerts
else
balloon_alert(user, "\The [src] is used up, but there are more wounds to treat on \the [affecting.name].") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] is used up, but there are more wounds to treat on \the [affecting.name].") // CHOMPEdit - Balloon Alerts
use(used)
/obj/item/stack/medical/bruise_pack
@@ -168,7 +168,7 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "The [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts
return
if(affecting.is_bandaged())
@@ -176,8 +176,8 @@
return 1
else
var/available = get_amount()
user.balloon_alert_visible("\The [user] starts treating [M]'s [affecting.name].", \
"Treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] starts treating [M]'s [affecting.name].", \
"treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
var/used = 0
for (var/datum/wound/W in affecting.wounds)
if (W.internal)
@@ -187,7 +187,7 @@
if(used == amount)
break
if(!do_mob(user, M, W.damage/5, exclusive = TRUE))
balloon_alert(user, "Stand still to bandage wounds.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "stand still to bandage wounds.") // CHOMPEdit - Balloon Alerts
break
if(affecting.is_bandaged()) // We do a second check after the delay, in case it was bandaged after the first check.
@@ -195,19 +195,19 @@
return 1
if(used >= available)
balloon_alert(user, "You run out of [src]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you run out of [src]!") // CHOMPEdit - Balloon Alerts
break
if (W.current_stage <= W.max_bleeding_stage)
user.balloon_alert_visible("\The [user] bandages \a [W.desc] on [M]'s [affecting.name].", \
"Bandaged \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] bandages \a [W.desc] on [M]'s [affecting.name].", \
"bandaged \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
//H.add_side_effect("Itch")
else if (W.damage_type == BRUISE)
user.balloon_alert_visible("\The [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].", \
"Placed bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].", \
"placed bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].", \
"Placed bandaid over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].", \
"placed bandaid over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
W.bandage()
// W.disinfect() // VOREStation - Tech1 should not disinfect
playsound(src, pick(apply_sounds), 25)
@@ -215,9 +215,9 @@
affecting.update_damages()
if(used == amount)
if(affecting.is_bandaged())
balloon_alert(user, "\The [src] is used up.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] is used up.") // CHOMPEdit - Balloon Alerts
else
balloon_alert(user, "\The [src] is used up, but there are more wounds to treat on \the [affecting.name].") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] is used up, but there are more wounds to treat on \the [affecting.name].") // CHOMPEdit - Balloon Alerts
use(used)
/obj/item/stack/medical/ointment
@@ -242,23 +242,23 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "The [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return
if(affecting.is_salved())
balloon_alert(user, "The wounds on [M]'s [affecting.name] have already been salved.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the wounds on [M]'s [affecting.name] have already been salved.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return 1
else
user.balloon_alert_visible("\The [user] starts salving wounds on [M]'s [affecting.name].", \
"Salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \
"salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
if(!do_mob(user, M, 10, exclusive = TRUE))
balloon_alert(user, "Stand still to salve wounds.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
balloon_alert(user, "stand still to salve wounds.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return 1
if(affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check.
balloon_alert(user, "[M]'s [affecting.name] have already been salved.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return 1
user.balloon_alert_visible("[user] salved wounds on [M]'s [affecting.name].", \
"Salved wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
"salved wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
use(1)
affecting.salve()
playsound(src, pick(apply_sounds), 25)
@@ -287,7 +287,7 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "The [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return
if(affecting.is_bandaged() && affecting.is_disinfected())
@@ -295,8 +295,8 @@
return 1
else
var/available = get_amount()
user.balloon_alert_visible("\The [user] starts treating [M]'s [affecting.name].", \
"Treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] starts treating [M]'s [affecting.name].", \
"treating [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
var/used = 0
for (var/datum/wound/W in affecting.wounds)
if (W.internal)
@@ -306,25 +306,25 @@
//if(used == amount) //VOREStation Edit
// break //VOREStation Edit
if(!do_mob(user, M, W.damage/5, exclusive = TRUE))
balloon_alert(user, "Stand still to bandage wounds.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
balloon_alert(user, "stand still to bandage wounds.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
break
if(affecting.is_bandaged() && affecting.is_disinfected()) // We do a second check after the delay, in case it was bandaged after the first check.
balloon_alert(user, "[M]'s [affecting.name] is already bandaged.") // CHOMPEdit - Balloon Alerts // CHOMPEdit - Balloon Alerts
return 1
if(used >= available)
balloon_alert(user, "You run out of [src]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you run out of [src]!") // CHOMPEdit - Balloon Alerts
break
if (W.current_stage <= W.max_bleeding_stage)
user.balloon_alert_visible("\The [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \
"Cleaning and sealing \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \
"cleaning and sealing \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else if (W.damage_type == BRUISE)
user.balloon_alert_visible("\The [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].", \
"Placed medical patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].", \
"placed medical patch over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\The [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].", \
"Smeared bioglue over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].", \
"smeared bioglue over \a [W.desc] on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
W.bandage()
W.disinfect()
W.heal_damage(heal_brute)
@@ -334,9 +334,9 @@
affecting.update_damages()
if(used == amount)
if(affecting.is_bandaged())
balloon_alert(user, "\The [src] is used up.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] is used up.") // CHOMPEdit - Balloon Alerts
else
balloon_alert(user, "\The [src] is used up, but there are more wounds to treat on \the [affecting.name].") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "\the [src] is used up, but there are more wounds to treat on \the [affecting.name].") // CHOMPEdit - Balloon Alerts
use(used)
/obj/item/stack/medical/advanced/ointment
@@ -357,22 +357,22 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.open)
balloon_alert(user, "The [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the [affecting.name] is cut open!") // CHOMPEdit - Balloon Alerts
if(affecting.is_salved())
balloon_alert(user, "[M]'s [affecting.name] has already been salved.") // CHOMPEdit - Balloon Alerts
return 1
else
user.balloon_alert_visible("\The [user] starts salving wounds on [M]'s [affecting.name].", \
"Salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] starts salving wounds on [M]'s [affecting.name].", \
"salving the wounds on [M]'s [affecting.name]." ) // CHOMPEdit - Balloon Alerts
if(!do_mob(user, M, 10, exclusive = TRUE))
balloon_alert(user, "Stand still to salve wounds.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "stand still to salve wounds.") // CHOMPEdit - Balloon Alerts
return 1
if(affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check.
balloon_alert(user, "[M]'s [affecting.name] have already been salved.") // CHOMPEdit - Balloon Alerts
return 1
user.balloon_alert_visible("[user] covers wounds on [M]'s [affecting.name] with regenerative membrane.", \
"Covered wounds on [M]'s [affecting.name] with regenerative membrane." ) // CHOMPEdit - Balloon Alerts
"covered wounds on [M]'s [affecting.name] with regenerative membrane." ) // CHOMPEdit - Balloon Alerts
affecting.heal_damage(0,heal_burn)
use(1)
affecting.salve()
@@ -400,25 +400,25 @@
var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
var/limb = affecting.name
if(!(affecting.organ_tag in splintable_organs))
balloon_alert(user, "You can't use \the [src] to apply a splint there!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you can't use \the [src] to apply a splint there!") // CHOMPEdit - Balloon Alerts
return
if(affecting.splinted)
balloon_alert(user, "[M]'s [limb] is already splinted!") // CHOMPEdit - Balloon Alerts
return
if (M != user)
user.balloon_alert_visible("[user] starts to apply \the [src] to [M]'s [limb].", "Applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("[user] starts to apply \the [src] to [M]'s [limb].", "applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
else
if(( !user.hand && (affecting.organ_tag in list(BP_R_ARM, BP_R_HAND)) || \
user.hand && (affecting.organ_tag in list(BP_L_ARM, BP_L_HAND)) ))
balloon_alert(user, "You can't apply a splint to the arm you're using!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you can't apply a splint to the arm you're using!") // CHOMPEdit - Balloon Alerts
return
user.balloon_alert_visible("[user] starts to apply \the [src] to their [limb].", "Applying \the [src] to your [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("[user] starts to apply \the [src] to their [limb].", "applying \the [src] to your [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
if(do_after(user, 50, M, exclusive = TASK_USER_EXCLUSIVE))
if(affecting.splinted)
balloon_alert(user, "[M]'s [limb] is already splinted!") // CHOMPEdit - Balloon Alerts
return
if(M == user && prob(75))
user.balloon_alert_visible("\The [user] fumbles [src].", "Fumbling [src].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] fumbles [src].", "fumbling [src].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
return
if(ishuman(user))
var/obj/item/stack/medical/splint/S = split(1)
@@ -426,9 +426,9 @@
if(affecting.apply_splint(S))
S.forceMove(affecting)
if (M != user)
user.balloon_alert_visible("\The [user] finishes applying [src] to [M]'s [limb].", "Finished applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] finishes applying [src] to [M]'s [limb].", "finished applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
else
user.balloon_alert_visible("\The [user] successfully applies [src] to their [limb].", "Successfully applied \the [src] to your [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] successfully applies [src] to their [limb].", "successfully applied \the [src] to your [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
return
S.dropInto(src.loc) //didn't get applied, so just drop it
if(isrobot(user))
@@ -436,10 +436,10 @@
if(B)
if(affecting.apply_splint(B))
B.forceMove(affecting)
user.balloon_alert_visible("\The [user] finishes applying [src] to [M]'s [limb].", "Finish applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] finishes applying [src] to [M]'s [limb].", "finish applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
B.use(1)
return
user.balloon_alert_visible("\The [user] fails to apply [src].", "Failed to apply [src].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] fails to apply [src].", "failed to apply [src].", "You hear something being wrapped.") // CHOMPEdit - Balloon Alerts
return
code/game/objects/items/stacks/nanopaste.dm
+10 -10
View File
@@ -21,33 +21,33 @@
R.adjustFireLoss(-15)
R.updatehealth()
use(1)
user.balloon_alert_visible("\The [user] applied some [src] on [R]'s damaged areas.",\
"You apply some [src] at [R]'s damaged areas.") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] applied some [src] on [R]'s damaged areas.",\
"you apply some [src] at [R]'s damaged areas.") // CHOMPEdit - Balloon Alerts
else
balloon_alert(user, "All [R]'s systems are nominal.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "all [R]'s systems are nominal.") // CHOMPEdit - Balloon Alerts
if (ishuman(M)) //Repairing robolimbs
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
if(!S)
balloon_alert(user, "No body part there to work on!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "no body part there to work on!") // CHOMPEdit - Balloon Alerts
return 1
if(S.organ_tag == BP_HEAD)
if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
balloon_alert(user, "You can't apply [src] through [H.head]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you can't apply [src] through [H.head]!") // CHOMPEdit - Balloon Alerts
return 1
else
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
balloon_alert(user, "You can't apply [src] through [H.wear_suit]!") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "you can't apply [src] through [H.wear_suit]!") // CHOMPEdit - Balloon Alerts
return 1
//VOREStation Edit Start
if (S && (S.robotic >= ORGAN_ROBOT))
if(!S.get_damage())
balloon_alert(user, "Nothing to fix here.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "nothing to fix here.") // CHOMPEdit - Balloon Alerts
else if((S.open < 2) && (S.brute_dam + S.burn_dam >= S.min_broken_damage) && !repair_external)
balloon_alert(user, "The damage is too extensive for this nanite swarm to handle.") // CHOMPEdit - Balloon Alerts
balloon_alert(user, "the damage is too extensive for this nanite swarm to handle.") // CHOMPEdit - Balloon Alerts
else if(can_use(1))
user.setClickCooldown(user.get_attack_speed(src))
if(S.open >= 2)
@@ -57,6 +57,6 @@
S.heal_damage(restoration_external,restoration_external, robo_repair =1)
H.updatehealth()
use(1)
user.balloon_alert_visible("\The [user] applies some nanite paste on [user != M ? "[M]'s [S.name]" : "[S]"] with [src].",\
"You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].") // CHOMPEdit - Balloon Alerts
user.balloon_alert_visible("\the [user] applies some nanite paste on [user != M ? "[M]'s [S.name]" : "[S]"] with [src].",\
"you apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].") // CHOMPEdit - Balloon Alerts
//VOREStation Edit End
code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm
+1 -1
View File
@@ -24,4 +24,4 @@
/obj/fiftyspawner/oracarpet
name = "stack of orange carpet"
type_to_spawn = /obj/item/stack/tile/carpet/oracarpet
type_to_spawn = /obj/item/stack/tile/carpet/oracarpet
code/game/objects/items/stacks/tiles/tile_types_ch.dm
+6 -6
View File
@@ -102,19 +102,19 @@
desc = "A piece of orange carpet. It is the same size as a normal floor tile!"
icon_state = "tile-carpet"
default_type = MAT_CARPET_ORANGE
/obj/item/stack/tile/carpet/brncarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/blucarpet2
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/greencarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/purplecarpet
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/geo
icon_state = "tile-carpet-deco"
desc = "A piece of carpet with a gnarly geometric design. It is the same size as a normal floor tile!"
@@ -126,7 +126,7 @@
/obj/item/stack/tile/carpet/retro_red
icon_state = "tile-carpet-retro-red"
desc = "A piece of carpet with red-ical space patterns. It is the same size as a normal floor tile!"
/obj/item/stack/tile/carpet/happy
icon_state = "tile-carpet-happy"
desc = "A piece of carpet with happy patterns. It is the same size as a normal floor tile!"
code/game/objects/items/stacks/tiles/tile_types_yw.dm
+1 -1
View File
@@ -18,4 +18,4 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/oracarpet
name = "orange carpet"
icon_state = "tile-carpet"
icon_state = "tile-carpet"
code/game/objects/items/trash_vr.dm
+2 -2
View File
@@ -7,7 +7,7 @@
playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
user.drop_item()
forceMove(H.vore_selected)
balloon_alert(H, "You can taste the flavor of garbage. Wait what?") // CHOMPEdit - Balloon alerts
balloon_alert(H, "you can taste the flavor of garbage. Wait what?") // CHOMPEdit - Balloon alerts
return
if(isrobot(M))
@@ -16,7 +16,7 @@
playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
user.drop_item()
forceMove(R.vore_selected)
R.balloon_alert_visible("[user] feeds [R] with [src]!", "You feed [R] \the [src]!") // CHOMPEdit - Balloon alerts
R.balloon_alert_visible("[user] feeds [R] with [src]!", "you feed [R] \the [src]!") // CHOMPEdit - Balloon alerts
return
..()
code/game/objects/items/weapons/manuals_ch.dm
+1 -1
View File
@@ -21,4 +21,4 @@
</head>
<body>
<h1>((https://wiki.chompstation13.net/index.php?title=Guide_to_Chemistry))</h1>
"}
"}
code/game/objects/items/weapons/material/misc_ch.dm
+1 -1
View File
@@ -36,4 +36,4 @@
force_divisor = initial(force_divisor)
icon_state = initial(icon_state)
item_state = initial(item_state)
..()
..()
code/game/objects/items/weapons/material/twohanded_ch.dm
-1
View File
@@ -97,4 +97,3 @@
/obj/item/material/twohanded/sledgehammer/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "mjollnir[wielded]"
return
code/game/objects/items/weapons/storage/fancy_ch.dm
+1 -1
View File
@@ -4,4 +4,4 @@
/obj/item/storage/fancy/cigar/havana
name = "havanian cigar case"
starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/havana = 7)
starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/havana = 7)
code/game/objects/items/weapons/storage/fancy_yw.dm
+1 -1
View File
@@ -6,4 +6,4 @@
desc = "A packet of 6 f13 brand cigarettes, they somehow have a faint flavor of gunpowder... And mustard gas."
description_fluff = "f13 is a side brand of the Mauser family. The Mauser brand is an old earth, German company that has managed to stay afloat throughout the years, they mainly produce projectile weapons that are known to be extremely efficient and powerful. They are also known for their Gorilla class mech which is a force to be reckoned with. They have a wide range of other branded products, including this cigarette packet."
icon_state = "MauserPacket"
brand = "\improper Mauser"
brand = "\improper Mauser"
code/game/objects/micro_structures.dm
+1 -1
View File
@@ -459,4 +459,4 @@ var/global/list/micro_tunnels = list()
var/obj/structure/micro_tunnel/tunnel = new (get_turf(src.loc))
tunnel.set_dir(dir)
qdel(src)
qdel(src)
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
+1 -1
View File
@@ -41,4 +41,4 @@
extra_decals = list(
"stripe_vertical_mid_partial" = COLOR_WARM_YELLOW,
"hop" = COLOR_WARM_YELLOW
)
)
code/game/objects/structures/crates_lockers/closets/secure/antimatter_am.dm
+1 -1
View File
@@ -21,4 +21,4 @@
new /obj/item/am_containment(src)
new /obj/item/stack/cable_coil/yellow(src)
new /obj/item/stack/cable_coil(src)
return
return
code/game/objects/structures/dancepole_vr.dm
+1 -1
View File
@@ -22,4 +22,4 @@
if(!src) return
to_chat(user, span_notice("You dissasembled \the [src]!"))
new /obj/item/stack/material/steel(src.loc, 1)
qdel(src)
qdel(src)
code/game/objects/structures/new_signs.dm
+1 -1
View File
@@ -2,4 +2,4 @@
name = "\improper Coffee Shop and Library"
desc = "A sign that perfectly depicts that there is, in fact, both a coffee shop and a library in this direction."
icon = 'icons/obj/coffee.dmi'
icon_state = "coffee_sign"
icon_state = "coffee_sign"
code/game/objects/structures/props/blackbox.dm
+1 -1
View File
@@ -306,4 +306,4 @@
<B>SWITCHING MODE TO : <U>ENERGY-SAVING MODE.</U></B>
"}
//CHOMPADD end
//CHOMPADD end
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/obj/structure/bed/chair/sofa/corner
base_icon = "sofacorner"
icon_state = "sofacorner" //CHOMPstation edit: preview in map maker
/obj/structure/bed/chair/modern_chair
name = "modern chair"
desc = "It's like sitting in an egg."
code/game/turfs/flooring/floor_yw.dm
+1 -1
View File
@@ -27,4 +27,4 @@
name = "grass"
desc = "You can't tell if this is real grass or just cheap plastic imitation."
icon ='icons/obj/clockwork_objects.dmi'
icon_base = "grass"
icon_base = "grass"
code/game/turfs/flooring/flooring_decals_yw.dm
-1
View File
@@ -18,4 +18,3 @@
/obj/effect/floor_decal/snow/floor/pointy
icon_state = "snowfloorpointy"
code/game/turfs/simulated/lava.dm
+2 -2
View File
@@ -31,11 +31,11 @@
soundloop = new(list(src), FALSE)
soundloop.start()
return ..()
/turf/simulated/floor/lava/Destroy()
soundloop.stop()
QDEL_NULL(soundloop)
. = ..()
/turf/simulated/floor/lava/make_outdoors()
code/game/turfs/simulated/wall_types_vr.dm
+1 -1
View File
@@ -187,7 +187,7 @@ var/list/flesh_overlay_cache = list()
icon_state = "sifwood"
icon = 'icons/turf/wall_masks_vr.dmi'
//CHOMPEdit Start
//CHOMPEdit Start
/turf/simulated/wall/rsifwood
icon_state = "sifwood"
icon = 'icons/turf/wall_masks_vr.dmi'
code/global_yw.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/hook/startup/proc/modules_yw()
robot_module_types += "XenoMaid"
//robot_module_types += "Blade" Chompedit Module is horribly broken and worthless. Should never have been enabled at all.
//robot_module_types += "Blade" Chompedit Module is horribly broken and worthless. Should never have been enabled at all.
//robot_module_types += "Surgeryhound" commented out to disable for now. not happy with resulting borg.
return 1
code/modules/Phorochemistry/phoroanalyzer.dm
+1 -1
View File
@@ -42,4 +42,4 @@
else
var/description = "Analysis complete - [R.name]: [R.description]"
sleep(20)
state(description)
state(description)
code/modules/Phorochemistry/phoronics_tile.dm
+1 -1
View File
@@ -33,4 +33,4 @@ datum/design/item/phoronics_tile
id = "phoronics_tile"
req_tech = list("magnets" = 3, "materials" = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1000)
build_path = /obj/item/stack/tile/phoronics */
build_path = /obj/item/stack/tile/phoronics */
code/modules/Phorochemistry/phorotelepad.dm
+1 -1
View File
@@ -59,4 +59,4 @@
id = "phoronics_telepad"
req_tech = list("bluespace" = 2, "materials" = 3)
materials = list(DEFAULT_WALL_MATERIAL = 1000)
build_path = /obj/item/phoronics_telepad */
build_path = /obj/item/phoronics_telepad */
code/modules/admin/view_variables/admin_delete.dm
+1 -1
View File
@@ -28,4 +28,4 @@
qdel(D)
if(!QDELETED(D))
vv_update_display(D, "deleted", "")
vv_update_display(D, "deleted", "")
code/modules/ai/say_list_ch.dm
+1 -1
View File
@@ -113,4 +113,4 @@
say_got_target = list("You! You help people!", "Can you help me?", "I'm lost!")
say_threaten = list("Help me!", "Please help!", "Hey, who turned out the lights?", "Allonsy!", "Geronimo!")
say_stand_down = list("Please. Anyone. Help!", "Where is everyone?", "Where am I?")
say_escalate = list("Help!", "I'm sorry!", "I can't stop!", "I don't want to do this!", "I don't want to go!")
say_escalate = list("Help!", "I'm sorry!", "I can't stop!", "I don't want to do this!", "I don't want to go!")
code/modules/artifice/deadringer.dm
+1 -1
View File
@@ -172,4 +172,4 @@
corpse.adjustBruteLoss(H.getBruteLoss())
corpse.UpdateAppearance()
corpse.regenerate_icons()
QDEL_NULL_LIST(corpse.internal_organs)
QDEL_NULL_LIST(corpse.internal_organs)
code/modules/busy_space_yw/air_traffic.dm
+2 -2
View File
@@ -96,7 +96,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
var/mission_noun = pick(source.flight_types) //pull from a list of owner-specific flight ops, to allow an extra dash of flavor
if(source.complex_tasks) //if our source has the complex_tasks flag, regenerate with a two-stage assignment
mission_noun = "[pick(source.task_types)] [pick(source.flight_types)]"
//First response is 'yes', second is 'no'
var/requests = list(
"special flight rules" = list("authorizing special flight rules", "denying special flight rules, not allowed for your traffic class"),
@@ -396,4 +396,4 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
//Ship sends response to ATC
msg(full_closure,"[prefix] [shipname]")
return
*/
*/
code/modules/client/preference_setup/loadout/loadout_accessories.dm
-1
View File
@@ -577,4 +577,3 @@ Talon pin
/datum/gear/accessory/bunny_tail/New()
..()
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_head_ch.dm
+1 -1
View File
@@ -28,4 +28,4 @@
/datum/gear/head/marisa
display_name = "Witch hat"
path = /obj/item/clothing/head/wizard/marisa
path = /obj/item/clothing/head/wizard/marisa
code/modules/clothing/accessories/armor.dm
+1 -1
View File
@@ -217,7 +217,7 @@
desc = "A pair of green arm pads reinforced with armor plating. Attaches to a plate carrier."
icon_state = "armguards_green"
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35)
/obj/item/clothing/accessory/armor/armguards/merc
name = "heavy arm guards"
desc = "A pair of red-trimmed black arm pads reinforced with heavy armor plating. Attaches to a plate carrier."
code/modules/clothing/accessories/clothing.dm
+1 -1
View File
@@ -592,4 +592,4 @@
/obj/item/clothing/accessory/replika/star
name = "security-technician replikant chestplate"
desc = "A sloped titanium-composite chest plate with a matte black finish, fitted for use by 2nd generation biosynthetics. Comes with red adjustable straps."
icon_state = "star"
icon_state = "star"
code/modules/clothing/head/hood_yw.dm
+1 -1
View File
@@ -27,4 +27,4 @@
/obj/item/clothing/head/hood/winter/snowsuit/cargo
name = "cargo winter hood"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
icon_state = "cargohood"
icon_state = "cargohood"
code/modules/clothing/head/jobs_yw.dm
+1 -1
View File
@@ -5,4 +5,4 @@
icon = 'icons/obj/clothing/hats_yw.dmi'
icon_state = "beret_blueshield"
icon_override = 'icons/mob/head_yw.dmi'
item_state = "beret_blueshield"
item_state = "beret_blueshield"
code/modules/clothing/head/solgov_vr.dm
+1 -1
View File
@@ -115,7 +115,7 @@
*/
/obj/item/clothing/head/beret/solgov
name = "peacekeeper beret"
desc = "A beret in Solar Central Government colors. For peacekeepers that are more inclined towards style than safety." //YW EDIT: Terran Commonwealth to Solar Central Government
desc = "A beret in Solar Central Government colors. For peacekeepers that are more inclined towards style than safety." //YW EDIT: Terran Commonwealth to Solar Central Government
/obj/item/clothing/head/beret/solgov/homeguard
name = "home guard beret"
code/modules/clothing/spacesuits/rig/modules/combat_ch.dm
+1 -1
View File
@@ -2,4 +2,4 @@
charges = list(
list("flashbang", "flashbang", /obj/item/grenade/flashbang, 3),
)
)
code/modules/clothing/spacesuits/rig/modules/utility_ch.dm
+1 -1
View File
@@ -6,4 +6,4 @@
interface_desc = "Super energy consumption for super speed."
sprint_speed = 3
use_power_cost = 100
active_power_cost = 5
active_power_cost = 5
code/modules/clothing/suits/armor_yw.dm
+2 -2
View File
@@ -22,7 +22,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEHOLSTER
open = 1
/obj/item/clothing/suit/storage/toggle/yw/secjacket/toggle()
set name = "Toggle Coat Buttons"
set category = "Object"
@@ -76,4 +76,4 @@
icon_state = "paramedic-vest"
icon_override = 'icons/mob/suit_yw.dmi'
item_state = "paramedic-vest_s"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 15, bio = 50, rad = 50)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 15, bio = 50, rad = 50)
code/modules/clothing/suits/hooded_yw.dm
+1 -1
View File
@@ -47,4 +47,4 @@
icon_state = "snowsuit_science"
hoodtype = /obj/item/clothing/head/hood/winter/snowsuit/science
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical, /obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle)
allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/analyzer,/obj/item/stack/medical, /obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle)
code/modules/clothing/under/miscellaneous_ch.dm
+1 -1
View File
@@ -28,4 +28,4 @@
/obj/item/clothing/under/skinsuit/fem/gray/short
name = "feminine short gray skinsuit"
icon = 'icons/inventory/uniform/item_ch.dmi'
icon_state = "skinsuitfem_handless_g"
icon_state = "skinsuitfem_handless_g"
code/modules/clothing/under/shorts_ch.dm
+1 -1
View File
@@ -9,4 +9,4 @@
icon_state = "cshorts_olive"
/obj/item/clothing/under/shorts/cshorts/khaki
icon_state = "cshorts_khaki"
icon_state = "cshorts_khaki"
code/modules/economy/coins.dm
+4 -4
View File
@@ -126,16 +126,16 @@
var/obj/item/stack/cable_coil/CC = W
if(string_attached)
// to_chat(user, span_notice("There already is a string attached to this coin."))
balloon_alert(user, "There is a string already attached to \the [src]") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "there is a string already attached to \the [src]") // CHOMPEdit - Changed to balloon alert
return
if (CC.use(1))
add_overlay("coin_string_overlay")
string_attached = 1
// to_chat(user, span_notice("You attach a string to the coin."))
balloon_alert(user, "String attached to \the [src]") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "string attached to \the [src]") // CHOMPEdit - Changed to balloon alert
else
// to_chat(user, span_notice("This cable coil appears to be empty."))
balloon_alert(user, "The coil seems to be empty...") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "the coil seems to be empty...") // CHOMPEdit - Changed to balloon alert
return
else if(W.has_tool_quality(TOOL_WIRECUTTER))
if(!string_attached)
@@ -147,7 +147,7 @@
cut_overlays()
string_attached = null
// to_chat(user, span_notice("You detach the string from the coin."))
balloon_alert(user, "String detached") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "string detached") // CHOMPEdit - Changed to balloon alert
else ..()
/obj/item/coin/attack_self(mob/user as mob)
code/modules/economy/price_list_ch.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/datum/reagent/ethanol/snaps
price_tag = 5
price_tag = 5
code/modules/economy/price_list_yw.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/obj/item/storage/fancy/cigarettes/yw/mauser
price_tag = 18
price_tag = 18
code/modules/error_handler/error_handler.dm
+5 -5
View File
@@ -11,7 +11,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
if(!istype(e)) // Something threw an unusual exception
log_error("\[[time_stamp()]] Uncaught exception: [e]")
return ..()
//CHOMP Edit Stealing this bit from TGStation to try to record OOM issues.
//this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
if(copytext(e.name,1,32) == "Maximum recursion level reached")
@@ -20,16 +20,16 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
//if we got to here without silently ending, the byond bug has been fixed.
log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
return //this will never happen.
else if(copytext(e.name,1,18) == "Out of resources!")
log_world("BYOND out of memory.")
log_game("BYOND out of memory.")
return ..()
//CHOMP Edit end
//CHOMP Edit end
if(!GLOB.error_last_seen) // A runtime is occurring too early in start-up initialization
return ..()
var/erroruid = "[e.file][e.line]"
var/last_seen = GLOB.error_last_seen[erroruid]
code/modules/events/aurora_caelus.dm
+2 -2
View File
@@ -11,7 +11,7 @@
Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. \
You will have approximately two minutes before the ions begin to reach the hull. \
We hope you enjoy the lights.", "Nanotrasen Meteorology Division") //VOREStation Edit //CHOMPedit: removes announcement .ogg
/datum/event/aurora_caelus/start()
affecting_z -= global.using_map.sealed_levels // Space levels only please!
for(var/mob/M in player_list)
@@ -31,6 +31,6 @@ Please return to your workplace and continue work as normal. \
Have a pleasant shift, [station_name()], and thank you for watching with us.",
"Nanotrasen Meteorology Division") //VOREStation Edit //CHOMPedit: removes announcement .ogg
..()
/datum/event/aurora_caelus/overmap/announce()
return
code/modules/events/brand_intelligence.dm
+8 -8
View File
@@ -6,15 +6,15 @@
var/list/obj/machinery/vending/infectedVendingMachines = list()
var/obj/machinery/vending/originMachine
//VORESTATION Edit - added machine speeches here for better fixing of the event.
//VORESTATION Edit - added machine speeches here for better fixing of the event. // CHOMPEdit, using balloon alerts
var/list/rampant_speeches = list("Try our aggressive new marketing strategies!", \
"You should buy products to feed your lifestyle obession!", \
"Consume!", \
"Your money can buy happiness!", \
"Engage direct marketing!", \
"Advertising is legalized lying! But don't let that put you off our great deals!", \
"You don't want to buy anything? Yeah, well I didn't want to buy your mom either.")
var/list/rampant_speeches = list("try our aggressive new marketing strategies!", \
"you should buy products to feed your lifestyle obession!", \
"consume!", \
"your money can buy happiness!", \
"engage direct marketing!", \
"advertising is legalized lying! But don't let that put you off our great deals!", \
"you don't want to buy anything? Yeah, well I didn't want to buy your mom either.")
//VORESTATION Edit End
/datum/event/brand_intelligence/announce()
code/modules/events/rogue_drones.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/datum/event/rogue_drone/announce()
var/msg
var/rng = rand(1,5)
//CHOMPStation Edit Start
//CHOMPStation Edit Start
switch(rng)
if(1)
msg = "A combat drone wing operating in close orbit above Sif has failed to return from a anti-piracy sweep. If any are sighted, \
code/modules/events/spacevine.dm
+1 -1
View File
@@ -9,4 +9,4 @@
/datum/event/spacevine/announce()
//level_seven_announcement() // Chomp Edit, this was stupid and vague and wrong.
command_announcement.Announce("Hazardous plant infestation detected on \the [station_name()]. Station facilities may be overgrown.", "Hazardous Biomass")
command_announcement.Announce("Hazardous plant infestation detected on \the [station_name()]. Station facilities may be overgrown.", "Hazardous Biomass")
code/modules/examine/descriptions/containers_ch.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/obj/item/reagent_containers/food/drinks/bottle/snaps
description_fluff = "Its a wonder how such an ancient and obscure drink from Earth made it all the way out here."
description_fluff = "Its a wonder how such an ancient and obscure drink from Earth made it all the way out here."
code/modules/food/food/snacks.dm
+26 -26
View File
@@ -78,7 +78,7 @@
food_inserted_micros -= F
if(!reagents.total_volume)
M.balloon_alert_visible("Finishes eating \the [src].","Finished eating \the [src].") // CHOMPEdit - Balloon alert
M.balloon_alert_visible("finishes eating \the [src].","finished eating \the [src].") // CHOMPEdit - Balloon alert
M.drop_from_inventory(src) // Drop food from inventory so it doesn't end up staying on the hud after qdel, and so inhands go away
@@ -121,19 +121,19 @@
/obj/item/reagent_containers/food/snacks/attack(mob/living/M as mob, mob/living/user as mob, def_zone) //CHOMPEdit
if(reagents && !reagents.total_volume)
// to_chat(user, span_danger("None of [src] left!"))
balloon_alert(user, "None of [src] left!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "none of [src] left!") // CHOMPEdit - Changed to balloon alert
user.drop_from_inventory(src)
qdel(src)
return 0
if(package)
// to_chat(M, span_warning("How do you expect to eat this with the package still on?"))
balloon_alert(user, "The package is in the way.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "the package is in the way.") // CHOMPEdit - Changed to balloon alert
return FALSE
if(canned)
// to_chat(M, span_warning("How do you expect to eat this without opening it?"))
balloon_alert(user, "The can is closed.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "the can is closed.") // CHOMPEdit - Changed to balloon alert
return FALSE
if(istype(M, /mob/living/carbon))
@@ -147,7 +147,7 @@
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
// to_chat(user, "Where do you intend to put \the [src]? You don't have a mouth!")
balloon_alert(user, "You don't have a mouth!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "you don't have a mouth!") // CHOMPEdit - Changed to balloon alert
return
var/obj/item/blocked = null
if(survivalfood)
@@ -156,7 +156,7 @@
blocked = H.check_mouth_coverage()
if(blocked)
// to_chat(user, span_warning("\The [blocked] is in the way!"))
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return
user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things
@@ -191,7 +191,7 @@
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
// to_chat(user, "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!")
balloon_alert(user, "\The [H] doesn't have a mouth!") // CHOMPEdit
balloon_alert(user, "\the [H] doesn't have a mouth!") // CHOMPEdit
return
var/obj/item/blocked = null
var/unconcious = FALSE
@@ -214,15 +214,15 @@
if(blocked)
// to_chat(user, span_warning("\The [blocked] is in the way!"))
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return
if(swallow_whole)
if(!(M.feeding))
balloon_alert(user, "You can't feed [H] a whole [src] as they refuse to be fed whole things!") // CHOMPEdit
balloon_alert(user, "you can't feed [H] a whole [src] as they refuse to be fed whole things!") // CHOMPEdit
return
if(!belly_target)
balloon_alert(user, "You can't feed [H] a whole [src] as they don't appear to have a belly to fit it!") // CHOMPEdit
balloon_alert(user, "you can't feed [H] a whole [src] as they don't appear to have a belly to fit it!") // CHOMPEdit
return
if(swallow_whole)
@@ -246,10 +246,10 @@
else
add_attack_logs(user,M,"Fed with [src.name] containing [reagentlist(src)]", admin_notify = FALSE)
user.visible_message("[user] feeds [M] [src].")
user.balloon_alert_visible("Feeds [M] [src].") // CHOMPEdit
user.balloon_alert_visible("feeds [M] [src].") // CHOMPEdit
else
balloon_alert(user, "This creature does not seem to have a mouth!") // CHOMPEdit
balloon_alert(user, "this creature does not seem to have a mouth!") // CHOMPEdit
return
if(swallow_whole)
@@ -279,14 +279,14 @@
belly_target = tgui_input_list(user, "Choose Belly", "Belly Choice", M.feedable_bellies())
if(!(M.feeding))
to_chat(user, "You can't feed [M] a whole [src] as they refuse to be fed whole things!")
balloon_alert("They refuse to be fed whole things!") // CHOMPEdit
balloon_alert(user, "they refuse to be fed whole things!") // CHOMPEdit
return
if(!belly_target)
to_chat(user, "You can't feed [M] a whole [src] as they don't appear to have a belly to fit it!")
balloon_alert("They don't have a belly to fit it!")// CHOMPEdit
balloon_alert(user, "they don't have a belly to fit it!")// CHOMPEdit
return
user.visible_message("[user] attempts to make [M] consume [src] whole into their [belly_target].")
user.balloon_alert_visible("Attempts to make [M] consume [src] whole into their [belly_target].")// CHOMPEdit
user.balloon_alert_visible("attempts to make [M] consume [src] whole into their [belly_target].")// CHOMPEdit
var/feed_duration = 3 SECONDS
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M, feed_duration))
@@ -295,7 +295,7 @@
return
add_attack_logs(user,M,"Whole-fed with [src.name] containing [reagentlist(src)] into [belly_target]", admin_notify = FALSE)
user.visible_message("[user] successfully forces [src] into [M]'s [belly_target].") // CHOMPEdit
user.balloon_alert_visible("Forces [src] into [M]'s [belly_target].") // CHOMPEdit
user.balloon_alert_visible("forces [src] into [M]'s [belly_target].") // CHOMPEdit
user.drop_item()
forceMove(belly_target)
return 1 //CHOMPAdd End
@@ -336,7 +336,7 @@
if(package || canned)
to_chat(user, span_warning("You cannot stuff anything into \the [src] without opening it first.")) // CHOMPEdit
balloon_alert(user, "Open \the [src] first!") // CHOMPEdit
balloon_alert(user, "open \the [src] first!") // CHOMPEdit
return
var/obj/item/holder/H = W
@@ -354,7 +354,7 @@
food_inserted_micros += M
to_chat(user, "Stuffed [M] into \the [src].")
balloon_alert(user, "Stuffs [M] into \the [src].") // CHOMPEdit
balloon_alert(user, "stuffs [M] into \the [src].") // CHOMPEdit
to_chat(M, span_warning("[user] stuffs you into \the [src]."))
return
@@ -369,11 +369,11 @@
if(tgui_alert(user,"You can't slice \the [src] here. Would you like to hide \the [W] inside it instead?","No Cutting Surface!",list("Yes","No")) != "Yes")
to_chat(user, span_warning("You cannot slice \the [src] here! You need a table or at least a tray to do it."))
balloon_alert(user, "You cannot slice \the [src] here! You need a table or at least a tray to do it.") // CHOMPEdit
balloon_alert(user, "you cannot slice \the [src] here! You need a table or at least a tray to do it.") // CHOMPEdit
return
else
to_chat(user, "Slipped \the [W] inside \the [src].")
balloon_alert(user, "Slipped \the [W] inside \the [src].") // CHOMPEdit
balloon_alert(user, "slipped \the [W] inside \the [src].") // CHOMPEdit
user.drop_from_inventory(W, src)
add_fingerprint(user)
contents += W
@@ -382,17 +382,17 @@
if (has_edge(W))
if (!can_slice_here)
to_chat(user, span_warning("You cannot slice \the [src] here! You need a table or at least a tray to do it."))
balloon_alert(user, "You need a table or at least a tray to slice it.") // CHOMPEdit
balloon_alert(user, "you need a table or at least a tray to slice it.") // CHOMPEdit
return
var/slices_lost = 0
if (W.w_class > 3)
user.visible_message(span_notice("\The [user] crudely slices \the [src] with [W]!"), span_notice("You crudely slice \the [src] with your [W]!"))
user.balloon_alert_visible("Crudely slices \the [src]", "Crudely sliced \the [src]") // CHOMPEdit
user.balloon_alert_visible("crudely slices \the [src]", "crudely sliced \the [src]") // CHOMPEdit
slices_lost = rand(1,min(1,round(slices_num/2)))
else
user.visible_message(span_notice(span_bold("\The [user]") + " slices \the [src]!"), span_notice("You slice \the [src]!"))
user.balloon_alert_visible("Slices \the [src]", "Sliced \the [src]!") // CHOMPEdit
user.balloon_alert_visible("slices \the [src]", "sliced \the [src]!") // CHOMPEdit
// CHOMPEdit End - A long list of to_chat to balloon_alert
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
@@ -444,7 +444,7 @@
/obj/item/reagent_containers/food/snacks/proc/unpackage(mob/user)
package = FALSE
to_chat(user, span_notice("You unwrap [src]."))
balloon_alert(user, "Unwrapped \the [src].") // CHOMPEdit
balloon_alert(user, "unwrapped \the [src].") // CHOMPEdit
playsound(user,opening_sound, 15, 1)
if(package_trash)
var/obj/item/T = new package_trash
@@ -457,7 +457,7 @@
/obj/item/reagent_containers/food/snacks/proc/uncan(mob/user)
canned = FALSE
to_chat(user, span_notice("You unseal \the [src] with a crack of metal."))
balloon_alert(user, "Unsealed \the [src]") // CHOMPEdit
balloon_alert(user, "unsealed \the [src]") // CHOMPEdit
playsound(loc,opening_sound, rand(10,50), 1)
if(canned_open_state)
icon_state = canned_open_state
@@ -469,7 +469,7 @@
if(!isanimal(user) && !isalien(user))
return
user.visible_message(span_infoplain(span_bold("[user]") + " nibbles away at \the [src]."),span_info("You nibble away at \the [src]."))
user.balloon_alert_visible("Nibbles away at \the [src].","Nibbled away at \the [src].") // CHOMPEdit
user.balloon_alert_visible("nibbles away at \the [src].","nibbled away at \the [src].") // CHOMPEdit
bitecount++
if(reagents)
reagents.trans_to_mob(user, bitesize, CHEM_INGEST)
code/modules/food/kitchen/cooking_machines/candy.dm
+1 -1
View File
@@ -51,4 +51,4 @@
return
if(default_part_replacement(user, O))
return
..()
..()
code/modules/food/kitchen/cooking_machines/grill.dm
+1 -1
View File
@@ -55,4 +55,4 @@
return
if(default_part_replacement(user, O))
return
..()
..()
code/modules/food/kitchen/smartfridge/engineering.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/amount = I.get_amount()
if(amount < 1)
return
count = min(count, amount)
while(count > 0)
code/modules/gamemaster/event2/events/engineering/blob.dm
+1 -1
View File
@@ -159,4 +159,4 @@
//command_announcement.Announce(lines.Join("\n"), "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
command_announcement.Announce(lines.Join("\n"), "Hazardous Biomass - URGENT!", new_sound = 'sound/AI/outbreak5.ogg')
// Chomp edit - Better wording and also made the alert level 5. Lower number = More urgent.
// Chomp edit - Better wording and also made the alert level 5. Lower number = More urgent.
code/modules/games/cards_ch.dm
+1 -1
View File
@@ -42,4 +42,4 @@
P.name = "[number] of [suit]"
P.card_icon = "casino_[colour]col"
P.back_icon = "casino_card_back"
cards += P
cards += P
code/modules/interserver shipping/_shipping_globals.dm
+1 -1
View File
@@ -8,4 +8,4 @@ var/list/global_shipping_ids = list()
var/list/global_shipping_paths = list()
// The global list of received requests, sorted by their IP of origin.
var/list/shipping_contacts = list("origin" = list())
var/list/shipping_contacts = list("origin" = list())
code/modules/interserver shipping/shipping_api.dm
+1 -1
View File
@@ -192,4 +192,4 @@
statuscode = 200
response = "Pong."
data = global_shipping_ids
return 1
return 1
code/modules/interserver shipping/shipping_hooks.dm
+1 -1
View File
@@ -37,4 +37,4 @@
continue
global_shipping_ids[tuple[1]] = tuple[2]
global_shipping_paths[tuple[2]] = tuple[1]
global_shipping_paths[tuple[2]] = tuple[1]

Some files were not shown because too many files have changed in this diff Show More