cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-26 22:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into fairylights"

Browse Source 
This reverts commit 2947727659, reversing
changes made to 91063fe882.
This commit is contained in:
Dahlular
2022-07-09 04:55:33 -06:00
parent eb22b66720
commit e51460cb5d
123 changed files with 2065 additions and 3633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+2 -2
View File
@@ -699,11 +699,11 @@
// called when this atom is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
/atom/movable/proc/on_exit_storage(datum/component/storage/concrete/S)
SEND_SIGNAL(src, COMSIG_STORAGE_EXITED, S)
return
// called when this atom is added into a storage item, which is passed on as S. The loc variable is already set to the storage item.
/atom/movable/proc/on_enter_storage(datum/component/storage/concrete/S)
SEND_SIGNAL(src, COMSIG_STORAGE_ENTERED, S)
return
/atom/movable/proc/get_spacemove_backup()
var/atom/movable/dense_object_backup
code/game/machinery/teleporter.dm
+5 -17
View File
@@ -76,23 +76,11 @@
if(!calibrated && iscarbon(M) && prob(30 - ((accuracy) * 10))) //oh dear a problem
var/mob/living/carbon/C = M
//Rework to teleporter mishap
log_game("[C] ([key_name(C)]) had a teleporter mishap")
to_chat(C, "<span class='italics'>You feel the world contort and twist....</span>") //idk a good line
C.adjustCloneLoss( rand(40,75) )
C.apply_effect((rand(120 - accuracy * 40, 180 - accuracy * 60)), EFFECT_IRRADIATE, 0) //recycling this for some extra spice
//Oh yea, random limb removal, adjust/comment out if too harsh a punishment
for( var/obj/item/bodypart/BP in C.bodyparts )
if( BP.body_part != CHEST ) //I am not ready to find out what happens if your chest is missing
if(prob(50))
BP.dismember()
if(C.dna?.species && C.dna.species.id != "fly" && !HAS_TRAIT(C, TRAIT_RADIMMUNE))
to_chat(C, "<span class='italics'>You hear a buzzing in your ears.</span>")
C.set_species(/datum/species/fly)
log_game("[C] ([key_name(C)]) was turned into a fly person")
C.apply_effect((rand(120 - accuracy * 40, 180 - accuracy * 60)), EFFECT_IRRADIATE, 0)
calibrated = FALSE
return
code/game/objects/items/devices/dogborg_sleeper.dm
+6 -13
View File
@@ -86,11 +86,11 @@
to_chat(user, "<span class='warning'>Your [src] is already occupied.</span>")
return
user.visible_message("<span class='warning'>[hound.name] is carefully inserting [target.name] into their [src].</span>",
user.visible_message("<span class='warning'>[hound.name] is carefully inserting [target.name] into their [src].</span>",
"<span class='notice'>You start placing [target] into your [src]...</span>")
if(!patient && iscarbon(target) && !target.buckled && do_after (user, 100, target = target))
if(!in_range(src, target))
if(!in_range(src, target))
return
if(patient)
return
@@ -217,7 +217,7 @@
data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss()
data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN)
if(mob_occupant.reagents.reagent_list.len)
for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)
chemical_list += list(list("name" = R.name, "volume" = R.volume))
@@ -393,7 +393,7 @@
H.playsound_local(source, null, 45, falloff = 0, S = pred_digest)
else if(H in contents)
H.playsound_local(source, null, 65, falloff = 0, S = prey_digest)
UpdateGut(hound)
if(cleaning)
addtimer(CALLBACK(src, .proc/clean_cycle, hound), 50)
@@ -515,7 +515,7 @@
trashman.reset_perspective(src)
user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashman] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashman] slips inside.</span>")
playsound(hound, 'sound/effects/bin_close.ogg', 80, 1)
UpdateGut(hound)
@@ -523,11 +523,4 @@
var/current_belly = ..()
if(length(contents) > 11)
current_belly = BORGBELLY_RED
return current_belly
/obj/item/dogborg/sleeper/compactor/ore//identical to janihound for moment
name = "ore processor"
desc = "A mounted compactor unit with fuel processor."
icon = 'icons/mob/dogborg.dmi'
icon_state = "compactorb"//needs its own icon
return current_belly
code/game/objects/items/devices/radio/radio.dm
-6
View File
@@ -67,12 +67,6 @@
syndie = TRUE
if(keyslot.independent)
independent = TRUE
//Skyrat edit start
if(extra_channels)
for(var/ch_name in extra_channels)
if(!(ch_name in channels))
channels[ch_name] = extra_channels[ch_name]
//Skyrat edit end
for(var/ch_name in channels)
secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])
code/game/objects/items/implants/implant_kinaris.dm
-38
View File
@@ -1,38 +0,0 @@
/obj/item/implant/kinaris
name = "KNS ENH implant"
desc = "Enables enhanced reflexes, permitting the user to deploy specialised training."
icon = 'icons/obj/implants.dmi'
icon_state ="adrenal"
activated = 1
var/datum/martial_art/kinaris/style = new
/obj/item/implant/kinaris/get_data()
var/dat = {"<b>Implant Specifications:</b><BR>
<b>Name:</b> KNS ENH Implant<BR>
<b>Life:</b> Roughly twelve hours after death of host<BR>
<b>Implant Details:</b> <BR>
<b>Function:</b> Forces certain sections of the brain and body into a state of higher function, permitting the user to deploy specialised training."}
return dat
/obj/item/implant/kinaris/activate()
. = ..()
var/mob/living/carbon/human/H = imp_in
if(!ishuman(H))
return
if(!H.mind)
return
if(H.mind.has_martialart(MARTIALART_KNS_CQC))
style.remove(H)
to_chat(H, "<span class='notice'>You disable your reflex implant.</span>")
else
style.teach(H,1)
to_chat(H, "<span class='notice'>You feel your body burn briefly as you enable your reflex implant.</span>")
/obj/item/implanter/kinaris
name = "implanter (KNS ENH)"
imp_type = /obj/item/implant/kinaris
/obj/item/implantcase/kinaris
name = "implant case - 'KNS ENH'"
desc = "A glass case containing an implant that can enhance the body of the user."
imp_type = /obj/item/implant/kinaris
code/game/objects/items/robot/robot_upgrades.dm
+4 -4
View File
@@ -150,7 +150,7 @@
desc = "A diamond drill replacement for the mining module's standard drill."
icon_state = "cyborg_upgrade3"
require_module = 1
module_type = list(/obj/item/robot_module/miner, /obj/item/robot_module/orepup)
module_type = /obj/item/robot_module/miner
/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R, user = usr)
. = ..()
@@ -182,7 +182,7 @@
desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
icon_state = "cyborg_upgrade3"
require_module = 1
module_type = list(/obj/item/robot_module/miner, /obj/item/robot_module/orepup)
module_type = /obj/item/robot_module/miner
/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
. = ..()
@@ -285,7 +285,7 @@
icon_state = "ash_plating"
resistance_flags = LAVA_PROOF | FIRE_PROOF
require_module = 1
module_type = list(/obj/item/robot_module/miner, /obj/item/robot_module/orepup)
module_type = /obj/item/robot_module/miner
/obj/item/borg/upgrade/lavaproof/action(mob/living/silicon/robot/R, user = usr)
. = ..()
@@ -417,7 +417,7 @@
module_type = list(
/obj/item/robot_module/medical,
/obj/item/robot_module/medihound)
var/list/additional_reagents = list()
/obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R, user = usr)
code/game/objects/items/stacks/sheets/sheet_types.dm
-5
View File
@@ -481,11 +481,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new /datum/stack_recipe("donk-pockets teriyaki box", /obj/item/storage/box/donkpockets/donkpocketteriyaki), \
new /datum/stack_recipe("donk-pockets pizza box", /obj/item/storage/box/donkpockets/donkpocketpizza), \
new /datum/stack_recipe("donk-pockets berry box", /obj/item/storage/box/donkpockets/donkpocketberry), \
new /datum/stack_recipe("donk-pockets taco box", /obj/item/storage/box/donkpockets/donkpockettaco), \
new /datum/stack_recipe("donk-pockets plasma box", /obj/item/storage/box/donkpockets/donkpocketplasma), \
new /datum/stack_recipe("donk-pockets breakfast box", /obj/item/storage/box/donkpockets/donkpocketbreakfast), \
new /datum/stack_recipe("donk-pockets moth box", /obj/item/storage/box/donkpockets/donkpocketmoth), \
new /datum/stack_recipe("donk-pockets vegan box", /obj/item/storage/box/donkpockets/donkpocketvegan), \
new /datum/stack_recipe("donk-pockets honk box", /obj/item/storage/box/donkpockets/donkpockethonk), \
new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes),
null, \
code/game/objects/items/storage/boxes.dm
+1 -31
View File
@@ -437,36 +437,6 @@
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/spicy
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy
/obj/item/storage/box/donkpockets/donkpockettaco //Property of Angel's Donk Co. subsidary Not'cho Corp. "They're mine! Not yo's."
name = "box of taco-flavoured donk-pockets"
icon_state = "donkpocketboxtaco"
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/taco
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/taco
/obj/item/storage/box/donkpockets/donkpocketplasma
name = "box of toxic-flavoured donk-pockets"
icon_state = "donkpocketboxplasma"
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/plasma
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/plasma
/obj/item/storage/box/donkpockets/donkpocketbreakfast
name = "box of breakfast-flavoured donk-pockets"
icon_state = "donkpocketboxbreakfast"
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/breakfast
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/breakfast
/obj/item/storage/box/donkpockets/donkpocketmoth
name = "box of cloth-flavoured donk-pockets"
icon_state = "donkpocketboxmoth"
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/moth
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/moth
/obj/item/storage/box/donkpockets/donkpocketvegan
name = "box of veggie-flavoured donk-pockets"
icon_state = "donkpocketboxvegan"
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/vegan
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/vegan
/obj/item/storage/box/donkpockets/donkpocketteriyaki
name = "box of teriyaki-flavoured donk-pockets"
icon_state = "donkpocketboxteriyaki"
@@ -1355,4 +1325,4 @@
/obj/item/storage/box/marshmallow/PopulateContents()
for (var/i in 1 to 5)
new /obj/item/reagent_containers/food/snacks/marshmallow(src)
new /obj/item/reagent_containers/food/snacks/marshmallow(src)
code/game/turfs/simulated/floor/plating/asteroid.dm
+2 -3
View File
@@ -123,9 +123,8 @@
planetary_atmos = TRUE
baseturfs = /turf/open/lava/smooth/lava_land_surface
/turf/open/floor/plating/asteroid/spacehermit
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
baseturfs = /turf/open/floor/plating/asteroid/spacehermit
/turf/open/floor/plating/asteroid/airless
initial_gas_mix = AIRLESS_ATMOS
code/game/turfs/simulated/minerals.dm
-16
View File
@@ -221,22 +221,6 @@
/turf/closed/mineral/iron/volcanic = 95)
//For spacehermit stuff
/turf/closed/mineral/random/spacehermit
icon_state = "rock"
turf_type = /turf/open/floor/plating/asteroid/spacehermit
baseturfs = /turf/open/floor/plating/asteroid/spacehermit
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
defer_change = 1
mineralChance = 6
mineralSpawnChanceList = list(
/turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4, /turf/closed/mineral/titanium = 4,
/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
//end of spacehermit stuff
/turf/closed/mineral/iron
mineralType = /obj/item/stack/ore/iron