Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 17:41:50 +00:00

Files

nevimer 29d9d1a49f Merge remote-tracking branch 'skrat/master' into upstream-remake-stop-commiting-to-master

# Conflicts:
#	.github/CODEOWNERS
#	code/__DEFINES/footsteps.dm
#	code/game/objects/items/spear.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/language/language_holder.dm
#	code/modules/mob/living/carbon/human/species_types/abductors.dm
#	code/modules/mob/living/carbon/human/species_types/ethereal.dm
#	code/modules/mob/living/carbon/human/species_types/felinid.dm
#	code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
#	code/modules/mob/living/carbon/human/species_types/plasmamen.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	modular_skyrat/modules/altborgs/code/robot_model.dm
#	modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm
#	modular_skyrat/modules/examinemore/code/examine_more.dm
#	modular_skyrat/modules/opposing_force/code/equipment/loadouts.dm

2023-07-19 02:18:09 -04:00

_id_trim.dm

…

admin.dm

…

centcom.dm

[MIRROR] The Laser Musket (2023) (Settlement Helper Edition) [MDB IGNORE] (#22156 )

2023-07-14 15:21:42 -04:00

jobs.dm

Merge remote-tracking branch 'skrat/master' into upstream-remake-stop-commiting-to-master

2023-07-19 02:18:09 -04:00

outfits.dm