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

Resolve Build issues and logic conflicts from Rodent merge

Browse Source
This commit is contained in:
nevimer
2023-06-13 20:12:16 -04:00
parent f6c63bdea1
commit c19f724572
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs/security.dm
+6 -3
View File
@@ -65,8 +65,7 @@
cost = CARGO_CRATE_VALUE * 2 cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/clothing/head/helmet/sec = 3) contains = list(/obj/item/clothing/head/helmet/sec = 3)
crate_name = "helmet crate" crate_name = "helmet crate"
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/laser /datum/supply_pack/security/laser
name = "Lasers Crate" name = "Lasers Crate"
desc = "Contains three lethal, high-energy laser guns." desc = "Contains three lethal, high-energy laser guns."
@@ -74,6 +73,8 @@
access_view = ACCESS_ARMORY access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/laser = 3) contains = list(/obj/item/gun/energy/laser = 3)
crate_name = "laser crate" crate_name = "laser crate"
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/securitybarriers /datum/supply_pack/security/securitybarriers
name = "Security Barrier Grenades" name = "Security Barrier Grenades"
@@ -234,7 +235,7 @@
cost = CARGO_CRATE_VALUE * 5 cost = CARGO_CRATE_VALUE * 5
contains = list(/obj/item/gun/energy/e_gun/dragnet = 3) contains = list(/obj/item/gun/energy/e_gun/dragnet = 3)
crate_name = "\improper DRAGnet crate" crate_name = "\improper DRAGnet crate"
// SKYRAT EDIT REMOVAL BEGIN - CARGO ARMAMENTS // SKYRAT EDIT REMOVAL BEGIN - CARGO ARMAMENTS
/* /*
/datum/supply_pack/security/armory/energy /datum/supply_pack/security/armory/energy
@@ -245,6 +246,8 @@
contains = list(/obj/item/gun/energy/e_gun = 2) contains = list(/obj/item/gun/energy/e_gun = 2)
crate_name = "energy gun crate" crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma crate_type = /obj/structure/closet/crate/secure/plasma
*/
// SKYRAT EDIT REMOVAL END
/datum/supply_pack/security/armory/exileimp /datum/supply_pack/security/armory/exileimp
name = "Exile Implants Crate" name = "Exile Implants Crate"
modular_skyrat/master_files/code/datums/traits/negative.dm
+2
View File
@@ -56,6 +56,7 @@
mob_trait = TRAIT_NOGUNS mob_trait = TRAIT_NOGUNS
icon = FA_ICON_GUN icon = FA_ICON_GUN
//BUBBER EDIT MOVE BEGIN - NEGATIVE SENSITIVE SNOUT
/datum/quirk/sensitivesnout /datum/quirk/sensitivesnout
name = "Sensitive Snout" name = "Sensitive Snout"
desc = "Your snout has always been sensitive, and it really hurts when someone pokes it!" desc = "Your snout has always been sensitive, and it really hurts when someone pokes it!"
@@ -79,3 +80,4 @@
/datum/status_effect/sensitivesnout/get_examine_text() /datum/status_effect/sensitivesnout/get_examine_text()
return span_warning("[owner.p_their(TRUE)] snout is rather bappable...") return span_warning("[owner.p_their(TRUE)] snout is rather bappable...")
// BUBBER EDIT MOVE END
modular_skyrat/master_files/code/datums/traits/neutral.dm
+1 -1
View File
@@ -206,7 +206,7 @@
value = 0 value = 0
mob_trait = TRAIT_SENSITIVESNOUT mob_trait = TRAIT_SENSITIVESNOUT
icon = FA_ICON_FINGERPRINT icon = FA_ICON_FINGERPRINT
*/ BUBBER EDIT MOVE END */ // BUBBER EDIT MOVE END
/datum/quirk/overweight /datum/quirk/overweight
name = "Overweight" name = "Overweight"
modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm
+1 -1
View File
@@ -12,7 +12,7 @@
name = "Urban camouflage BDU" name = "Urban camouflage BDU"
item_path = /obj/item/clothing/under/rank/security/officer/hecu item_path = /obj/item/clothing/under/rank/security/officer/hecu
donator_only = TRUE donator_only = TRUE
restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/under/formal/lace_dress /datum/loadout_item/under/formal/lace_dress
name = "Lilac Dress" name = "Lilac Dress"