diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index a554397c41..31f34c5d4c 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -614,7 +614,7 @@ used_key_list[input_key] = 1 return input_key -#if DM_VERSION > 513 +#if DM_VERSION > 514 #error Remie said that lummox was adding a way to get a lists #error contents via list.values, if that is true remove this #error otherwise, update the version and bug lummox diff --git a/code/datums/looping_sounds/weather.dm b/code/datums/looping_sounds/weather.dm index d8ed8d123b..ea34fbb693 100644 --- a/code/datums/looping_sounds/weather.dm +++ b/code/datums/looping_sounds/weather.dm @@ -8,7 +8,7 @@ start_sound = 'sound/weather/ashstorm/outside/active_start.ogg' start_length = 130 end_sound = 'sound/weather/ashstorm/outside/active_end.ogg' - volume = 80 + volume = 60 /datum/looping_sound/active_inside_ashstorm mid_sounds = list( @@ -20,7 +20,7 @@ start_sound = 'sound/weather/ashstorm/inside/active_start.ogg' start_length = 130 end_sound = 'sound/weather/ashstorm/inside/active_end.ogg' - volume = 60 + volume = 20 /datum/looping_sound/weak_outside_ashstorm mid_sounds = list( diff --git a/code/game/machinery/computer/arcade/minesweeper.dm b/code/game/machinery/computer/arcade/minesweeper.dm index a7369348dc..dbd9890c81 100644 --- a/code/game/machinery/computer/arcade/minesweeper.dm +++ b/code/game/machinery/computer/arcade/minesweeper.dm @@ -311,12 +311,12 @@ var/new_rows = input(user, "How many rows do you want? (Minimum: 4, Maximum: 30)", "Minesweeper Rows") as null|num if(!new_rows || !user.canUseTopic(src, !hasSiliconAccessInArea(user))) return FALSE - new_rows = clamp(new_rows + 1, 4, 30) + new_rows = clamp(new_rows + 1, 4, 20) playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3) var/new_columns = input(user, "How many columns do you want? (Minimum: 4, Maximum: 50)", "Minesweeper Squares") as null|num if(!new_columns || !user.canUseTopic(src, !hasSiliconAccessInArea(user))) return FALSE - new_columns = clamp(new_columns + 1, 4, 50) + new_columns = clamp(new_columns + 1, 4, 30) playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3) var/grid_area = (new_rows - 1) * (new_columns - 1) var/lower_limit = round(grid_area*0.156) diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index ef2fb44d3d..f0d66d9097 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -328,6 +328,9 @@ REMOVE_TRAIT(occupant, TRAIT_RESISTHIGHPRESSURE, "bluespace_container_resist_high_pressure") REMOVE_TRAIT(occupant, TRAIT_RESISTLOWPRESSURE, "bluespace_container_resist_low_pressure") name = initial(name) + if(iscarbon(occupant)) + to_chat(occupant, "You pop out of the [src], slightly dazed!") + occupant.Stun(5 SECONDS) /obj/item/pet_carrier/bluespace/return_air() if(!occupant_gas_supply) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 2988b54e8f..956b91929e 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -164,11 +164,15 @@ /obj/item/storage/secure/briefcase/hos/mws_pack_hos/PopulateContents() new /obj/item/gun/ballistic/revolver/mws(src) new /obj/item/ammo_box/magazine/mws_mag(src) + new /obj/item/ammo_box/magazine/mws_mag(src) new /obj/item/ammo_casing/mws_batt/lethal(src) new /obj/item/ammo_casing/mws_batt/lethal(src) + new /obj/item/ammo_casing/mws_batt/lethal(src) + new /obj/item/ammo_casing/mws_batt/stun(src) new /obj/item/ammo_casing/mws_batt/stun(src) new /obj/item/ammo_casing/mws_batt/stun(src) new /obj/item/ammo_casing/mws_batt/ion(src) + new /obj/item/ammo_casing/mws_batt/taser(src) /obj/item/storage/secure/briefcase/hos/multiphase_box name = "\improper X-01 Multiphase energy gun box" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index d0b21016d4..53bcd28fa1 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -584,6 +584,9 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/structure/window/plasma/reinforced/unanchored anchored = FALSE +/obj/structure/window/plasma/reinforced/BlockSuperconductivity() + return TRUE + /obj/structure/window/reinforced/tinted name = "tinted window" icon_state = "twindow" diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 743931fbdd..5f425d87ff 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -358,7 +358,7 @@ /datum/gas/oxygen = 20, /datum/gas/nitrogen = 20, /datum/gas/nitrous_oxide = 5, - "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400 + "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*25 ) /datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air) @@ -369,8 +369,8 @@ var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY if ((air.get_moles(/datum/gas/oxygen) - heat_efficency < 0 )|| (air.get_moles(/datum/gas/nitrogen) - heat_efficency < 0)) //Shouldn't produce gas from nothing. return NO_REACTION - air.adjust_moles(/datum/gas/oxygen, heat_efficency) - air.adjust_moles(/datum/gas/nitrogen, heat_efficency) + air.adjust_moles(/datum/gas/oxygen, -heat_efficency) + air.adjust_moles(/datum/gas/nitrogen, -heat_efficency) air.adjust_moles(/datum/gas/nitryl, heat_efficency*2) if(energy_used > 0) @@ -499,7 +499,7 @@ min_requirements = list( /datum/gas/nitrogen = 10, /datum/gas/tritium = 5, - "TEMP" = 5000000) + "ENER" = NOBLIUM_FORMATION_ENERGY) /datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air) var/old_heat_capacity = air.heat_capacity() diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 2c3f92ee87..3d39f8720a 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -27,6 +27,7 @@ if(!is_station_level(H.z)) continue traumatize(H) + announce_to_ghosts(H) break /datum/round_event/brain_trauma/proc/traumatize(mob/living/carbon/human/H) diff --git a/code/modules/projectiles/boxes_magazines/external/rechargable.dm b/code/modules/projectiles/boxes_magazines/external/rechargable.dm index 76b2102731..5b774b111a 100644 --- a/code/modules/projectiles/boxes_magazines/external/rechargable.dm +++ b/code/modules/projectiles/boxes_magazines/external/rechargable.dm @@ -94,14 +94,15 @@ /obj/item/ammo_casing/mws_batt/lethal name = "'MWS' microbattery - LETHAL" type_color = "#bf3d3d" - type_name = "LETHAL" + type_name = "LASE" projectile_type = /obj/item/projectile/beam /obj/item/ammo_casing/mws_batt/stun - name = "'MWS' microbattery - STUN" + name = "'MWS' microbattery - DISABLER" type_color = "#0f81bc" - type_name = "STUN" + type_name = "DISABLE" projectile_type = /obj/item/projectile/beam/disabler + e_cost = 60 //gives it 10 disabler shots in line with literally all other eguns. /obj/item/ammo_casing/mws_batt/xray name = "'MWS' microbattery - XRAY" @@ -114,3 +115,9 @@ type_color = "#d084d6" type_name = "ION" projectile_type = /obj/item/projectile/ion + +/obj/item/ammo_casing/mws_batt/taser + name = "'MWS' microbattery - TASER" + type_color = "#e5ff00" + type_name = "TASE" + projectile_type = /obj/item/projectile/energy/electrode/security diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 06342937dc..0d60203cb5 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -339,7 +339,9 @@ slot_flags = null mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised sawn_desc = "I'm just here for the gasoline." - unique_reskin = null + unique_reskin = list("Default" = "ishotgun", + "Cobbled" = "old_ishotgun" + ) var/slung = FALSE /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) @@ -390,16 +392,12 @@ // ---------- Code originally from VoreStation ---------- /obj/item/gun/ballistic/revolver/mws name = "MWS-01 'Big Iron'" - desc = "Modular Weapons System" - + desc = "Modular Weapon System-01, does fit on your hip." icon = 'icons/obj/guns/projectile.dmi' icon_state = "mws" - - fire_sound = 'sound/weapons/Taser.ogg' - + fire_sound = 'sound/weapons/MWSfire.ogg' //i spent 1 hour making a cool sound but byond just compresses it to shit so have this instead >:( mag_type = /obj/item/ammo_box/magazine/mws_mag spawnwithmagazine = FALSE - recoil = 0 var/charge_sections = 6 diff --git a/html/changelog.html b/html/changelog.html index 35e88ba5a8..7de81e759a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,48 @@ -->
+

07 March 2021

+

Hatterhat updated:

+ +

Putnam3145 updated:

+ +

dzahlus updated:

+ +

timothyteakettle updated:

+ + +

05 March 2021

+

Putnam3145 updated:

+ +

keronshb updated:

+ + +

04 March 2021

+

LetterN updated:

+ +

03 March 2021

MarinaGryphon updated: