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

Merge remote-tracking branch 'Skyrat-SS13/master' into upstream-2024-06-16

Browse Source 
# Conflicts:
#	_maps/_basemap.dm
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	code/__DEFINES/surgery.dm
#	code/datums/weather/weather_types/radiation_storm.dm
#	code/modules/antagonists/changeling/changeling.dm
#	code/modules/clothing/neck/_neck.dm
#	code/modules/events/_event.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/kinetic_crusher.dm
#	code/modules/mob/living/basic/vermin/frog.dm
#	modular_skyrat/modules/borgs/code/robot_upgrade.dm
This commit is contained in:
nevimer
2024-06-16 20:54:25 -04:00
parent 151f789444 424da1d25d
commit e96f29d4a5
1182 changed files with 240379 additions and 22702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob_spawn/ghost_roles/golem_roles.dm
+1 -2
View File
@@ -36,8 +36,7 @@
if(forced_name || !iscarbon(spawned_mob))
return ..()
var/datum/species/golem/golem_species = new()
forced_name = golem_species.random_name()
forced_name = generate_random_name_species_based(spawned_mob.gender, TRUE, species_type = /datum/species/golem)
return ..()
/obj/effect/mob_spawn/ghost_role/human/golem/special(mob/living/new_spawn, mob/mob_possessor)
code/modules/mob_spawn/ghost_roles/mining_roles.dm
+23 -7
View File
@@ -201,9 +201,9 @@
/obj/structure/ash_walker_eggshell/Destroy()
if(!egg)
return ..()
var/mob/living/carbon/human/yolk = new /mob/living/carbon/human/(get_turf(src))
yolk.fully_replace_character_name(null,random_unique_lizard_name(gender))
var/mob/living/carbon/human/yolk = new(get_turf(src))
yolk.set_species(/datum/species/lizard/ashwalker)
yolk.fully_replace_character_name(null, yolk.generate_random_mob_name(TRUE))
yolk.underwear = "Nude"
yolk.equipOutfit(/datum/outfit/ashwalker)//this is an authentic mess we're making
yolk.update_body()
@@ -243,12 +243,12 @@
return FALSE
/obj/effect/mob_spawn/ghost_role/human/ash_walker/special(mob/living/carbon/human/spawned_human)
// SKYRAT EDIT MOVE
// Moved lizard name randomizer before parent call (so character names are preserved)
spawned_human.fully_replace_character_name(null,random_unique_lizard_name(gender))
quirks_enabled = TRUE //SKYRAT EDIT ADDITION
// SKYRAT EDIT ADDITION BEGIN
spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE)) // SKYRAT EDIT MOVE - Moving before parent call prevents char name randomization
quirks_enabled = TRUE // ghost role quirks
// SKYRAT EDIT ADDITION END
. = ..()
// SKYRAT EDIT END
spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE))
to_chat(spawned_human, "<b>Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Invade the strange structure of the outsiders if you must. Do not cause unnecessary destruction, as littering the wastes with ugly wreckage is certain to not gain you favor. Glory to the Necropolis!</b>")
spawned_human.mind.add_antag_datum(/datum/antagonist/ashwalker, team)
@@ -299,6 +299,7 @@
loadout_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts
quirks_enabled = TRUE // SKYRAT EDIT ADDITION - ghost role loadouts
random_appearance = FALSE // SKYRAT EDIT ADDITION
deletes_on_zero_uses_left = FALSE
/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/special(mob/living/new_spawn)
. = ..()
@@ -341,6 +342,21 @@
mask = /obj/item/clothing/mask/chameleon/gps
r_hand = /obj/item/melee/energy/sword/saber
/datum/outfit/lavaland_syndicate/comms/icemoon
name = "Icemoon Syndicate Comms Agent"
mask = /obj/item/clothing/mask/chameleon
shoes = /obj/item/clothing/shoes/winterboots/ice_boots/eva
/obj/item/clothing/mask/chameleon/gps/Initialize(mapload)
. = ..()
AddComponent(/datum/component/gps, "Encrypted Signal")
///Icemoon Syndicate Comms Agent
/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/icemoon
name = "Icemoon Comms Agent"
prompt_name = "a syndicate comms agent"
you_are_text = "You are a syndicate comms agent, assigned in an underground secret listening post close to your enemy's facility."
flavour_text = "Unfortunately, your hated enemy, Nanotrasen, has begun mining in this sector. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the outpost fall into enemy hands!"
important_text = "Do NOT let the outpost fall into enemy hands"
outfit = /datum/outfit/lavaland_syndicate/comms/icemoon