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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a

Browse Source
This commit is contained in:
Majkl-J
2025-02-20 00:00:19 -08:00
parent 719fa8a30e 5414cc325c
commit b6b8306fda
7388 changed files with 94693 additions and 418558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob_spawn/ghost_roles/golem_roles.dm
+1 -1
View File
@@ -78,7 +78,7 @@
if(!ishuman(new_spawn))
return
var/mob/living/carbon/human/new_golem = new_spawn
var/obj/item/organ/internal/vocal_cords/adamantine/free_golem_radio = new()
var/obj/item/organ/vocal_cords/adamantine/free_golem_radio = new()
free_golem_radio.Insert(new_golem)
// Subtype which follows orders
code/modules/mob_spawn/ghost_roles/mining_roles.dm
+7 -3
View File
@@ -103,9 +103,9 @@
l_pocket = /obj/item/food/pizzaslice/dank
r_pocket = /obj/item/storage/wallet/random
/datum/outfit/beachbum/post_equip(mob/living/carbon/human/bum, visualsOnly = FALSE)
/datum/outfit/beachbum/post_equip(mob/living/carbon/human/bum, visuals_only = FALSE)
. = ..()
if(visualsOnly)
if(visuals_only)
return
bum.dna.add_mutation(/datum/mutation/human/stoner)
@@ -136,7 +136,7 @@
glasses = /obj/item/clothing/glasses/sunglasses/reagent
shoes = /obj/item/clothing/shoes/sneakers/black
/datum/outfit/spacebartender/post_equip(mob/living/carbon/human/bartender, visualsOnly = FALSE)
/datum/outfit/spacebartender/post_equip(mob/living/carbon/human/bartender, visuals_only = FALSE)
. = ..()
var/obj/item/card/id/id_card = bartender.wear_id
if(bartender.age < AGE_MINOR)
@@ -325,6 +325,8 @@
shoes = /obj/item/clothing/shoes/combat
r_pocket = /obj/item/gun/ballistic/automatic/pistol
// r_hand = /obj/item/gun/ballistic/rifle/sniper_rifle //Bubberstation Edit
belt = /obj/item/storage/belt/utility/full
glasses = /obj/item/clothing/glasses/welding/up
implants = list(/obj/item/implant/weapons_auth)
id_trim = /datum/id_trim/syndicom/skyrat/interdyne //SKYRAT EDIT
@@ -341,6 +343,8 @@
suit = /obj/item/clothing/suit/armor/vest
mask = /obj/item/clothing/mask/chameleon/gps
r_hand = /obj/item/melee/energy/sword/saber
belt = /obj/item/storage/belt/utility/full
glasses = /obj/item/clothing/glasses/welding/up
/datum/outfit/lavaland_syndicate/comms/icemoon
name = "Icemoon Syndicate Comms Agent"