-
Notifications
You must be signed in to change notification settings - Fork 522
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
base: master
Are you sure you want to change the base?
Bridge and Command Offices Updates REATTEMPED #20559
Conversation
This reverts commit 2a1dc20.
!review |
new /obj/item/ipc_tag_scanner(src) | ||
new /obj/item/device/robotanalyzer(src) |
There was a problem hiding this comment.
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
new /obj/item/clothing/gloves/yellow(src) | ||
new /obj/item/clothing/gloves/yellow/specialu(src) | ||
new /obj/item/clothing/gloves/yellow/specialt(src) |
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
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
this time there shouldnt be issues caused by merge conflicts
see changelog