Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bridge and Command Offices Updates REATTEMPED #20559

Open
wants to merge 26 commits into
base: master
Choose a base branch
from

Conversation

beepbopbeepbop
Copy link
Contributor

this time there shouldnt be issues caused by merge conflicts

see changelog

@github-actions github-actions bot added the 🗺️ Mapping - Horizon The PR touches the Horizon map files. label Mar 5, 2025
@beepbopbeepbop
Copy link
Contributor Author

!review

@beepbopbeepbop
Copy link
Contributor Author

image
image
image
image
image

Comment on lines +37 to +38
new /obj/item/ipc_tag_scanner(src)
new /obj/item/device/robotanalyzer(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OM has no reason to have either of these

Comment on lines +18 to +20
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OM has no reason to have insulated gloves

@@ -72,10 +73,11 @@
new /obj/item/device/megaphone/command(src)
new /obj/item/storage/stickersheet/goldstar(src)
new /obj/item/gun/energy/repeater/pistol(src)
new /obj/item/melee/telebaton(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The XO has no reason to have a batoon

@@ -63,6 +63,7 @@
new /obj/item/storage/box/fancy/keypouch/service(src)
//Appearance
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/mask/gas/alt(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The XO has no reason to have a gas mask

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🗺️ Mapping - Horizon The PR touches the Horizon map files. Review Required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants