Skip to content

Commit

Permalink
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/em…
Browse files Browse the repository at this point in the history
…ergencyshock
  • Loading branch information
realforest2001 committed Aug 2, 2023
2 parents e10d712 + 30c97b6 commit 4e75d71
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),

list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
list("Shotgun Scabbard", 5, /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR),
list("USCM Satchel", 10, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR),
list("USCM Technical Satchel", 10, /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR),
list("USCM Technical Chestrig", 10, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR),
list("USCM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),

list("BELTS", -1, null, null),
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/items/devices/portable_vendor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,7 @@

list("MISC", 0, null, null, null),
list("Hollow Cane", 15, /obj/item/weapon/pole/fancy_cane/this_is_a_knife, "white", "A hollow cane that can store any commonplace sharp weaponry. Said weapon not included."),

list("AMMO", 0, null, null, null),
list("ES-4 stun magazine", 10, /obj/item/ammo_magazine/pistol/es4, "white", "Holds 19 rounds of specialized Conductive 9mm."),
)
10 changes: 10 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,16 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
max_fuel = 100
worn_accessible = TRUE

/obj/item/storage/backpack/marine/engineerpack/welder_chestrig
name = "\improper Technician Welder Chestrig"
desc = "A specialized Chestrig worn by technicians and engineers. It carries one medium fuel tank for quick welder refueling and use."
icon_state = "welder_chestrig"
item_state = "welder_chestrig"
max_storage_space = 12
has_gamemode_skin = FALSE
max_fuel = 100
worn_accessible = TRUE

// Pyrotechnician Spec backpack fuel tank
/obj/item/storage/backpack/marine/engineerpack/flamethrower
name = "\improper USCM Pyrotechnician G6-2 fueltank"
Expand Down
8 changes: 3 additions & 5 deletions code/game/objects/items/storage/lockbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@
req_access = list(ACCESS_WY_CORPORATE)

/obj/item/storage/lockbox/loyalty/fill_preset_inventory()
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88(src)
new /obj/item/ammo_magazine/pistol/mod88/rubber(src)
new /obj/item/ammo_magazine/pistol/mod88/rubber(src)

new /obj/item/ammo_magazine/pistol/es4(src)
new /obj/item/ammo_magazine/pistol/es4(src)
new /obj/item/ammo_magazine/pistol/es4(src)

/obj/item/storage/lockbox/cluster
name = "lockbox of cluster flashbangs"
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1152,3 +1152,9 @@
icon = 'icons/obj/structures/props/almayer_props.dmi'
icon_state = "rope"
density = FALSE

/obj/structure/prop/invuln/joey
name = "Workin' Joey"
desc = "A defunct Seegson-brand Working Joe lifted from deep storage by a crew of marines after the last shore leave. Attempts have been made to modify the janitorial synthetic to serve as a crude bartender, but with little success."
icon = 'icons/obj/structures/props/props.dmi'
icon_state = "joey"
1 change: 1 addition & 0 deletions code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, (new_human), WEAR_R_HAND)

/datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@

/// How many lesser drones the hive can support
var/lesser_drone_limit = 0
/// Slots available for lesser drones will never go below this number
var/lesser_drone_minimum = 3

var/datum/tacmap/xeno/tacmap
var/minimap_type = MINIMAP_FLAG_XENO
Expand Down Expand Up @@ -1052,7 +1054,7 @@
hugger.timeofdeath = user.timeofdeath // Keep old death time

/datum/hive_status/proc/update_lesser_drone_limit()
lesser_drone_limit = Ceiling(totalXenos.len / 3)
lesser_drone_limit = lesser_drone_minimum + Ceiling(length(totalXenos) / 3)

/datum/hive_status/proc/can_spawn_as_lesser_drone(mob/dead/observer/user)
if(!GLOB.hive_datum || ! GLOB.hive_datum[hivenumber])
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4042.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Thwomper"
delete-after: True
changes:
- maptweak: "added Workin' Joey to maint bar."
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4044.yml

This file was deleted.

4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4045.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Ben10083"
delete-after: True
changes:
- rscadd: "Lesser Drone Slots now have a minimum, currently set to 3."
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4049.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-4061.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4069.yml

This file was deleted.

5 changes: 5 additions & 0 deletions html/changelogs/AutoChangeLog-pr-4071.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
author: "Huffie56"
delete-after: True
changes:
- balance: "adding the possibility to buy \"ES-4 stun magazine\" for 10 point in the portable vendor."
- bugfix: "remove a bunch of ammo that where improper for ES-4 gun that are in the lockbox."
11 changes: 11 additions & 0 deletions html/changelogs/archive/2023-08.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2023-08-01:
Drathek:
- bugfix: Fixed hung mobs merging with weeds
2023-08-02:
Dorodomki:
- rscadd: Adds A Bipod and Rail Flashlight to the HPR kit
Drathek:
- balance: Facehugger attack windup duration is now 1s like the pounce windup.
Huffie56:
- bugfix: Care package for SG on WO will now spawn with the proper batteries for
them.
Morrow:
- bugfix: Fixes brain damage
- qol: Jittering from brain damage is now capped
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_lefthand_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/backpacks.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/props.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -75281,7 +75281,7 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/delta)
"wXv" = (
/obj/structure/machinery/vending/cigarette,
/obj/structure/prop/invuln/joey,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down

0 comments on commit 4e75d71

Please sign in to comment.