Skip to content

Commit

Permalink
Canary Tweaks (#16417)
Browse files Browse the repository at this point in the history
* daw

* awd

* he

* d

* d

* sn

* ss

* womp

* are

* sneed

---------

Co-authored-by: DanseMacabre <[email protected]>
  • Loading branch information
TheDanseMacabre and DanseMacabre authored Jun 26, 2023
1 parent 0de18f5 commit 3308daa
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 1 deletion.
3 changes: 3 additions & 0 deletions code/game/objects/items/weapons/circuitboards/rig.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
/obj/item/circuitboard/rig_assembly/civilian/eva
name = "EVA suit central circuit board"

/obj/item/circuitboard/rig_assembly/civilian/eva/pilot
name = "pilot suit central circuit board"

/obj/item/circuitboard/rig_assembly/civilian/ce
name = "advanced void suit central circuit board"
origin_tech = list(TECH_DATA = 5)
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/spacesuits/rig/rig_construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@
board_type = /obj/item/circuitboard/rig_assembly/civilian/eva
rig_type = /obj/item/rig/eva

/obj/item/rig_assembly/eva/pilot
name = "pilot suit control module assembly"
desc = "The assembly frame for a light hardsuit that is designed for pilots."
icon_base = "eva"
icon_state = "eva1"
board_type = /obj/item/circuitboard/rig_assembly/civilian/eva/pilot
rig_type = /obj/item/rig/eva/pilot

/obj/item/rig_assembly/industrial
name = "industrial suit control module assembly"
desc = "The assembly frame for a sturdy hardsuit used by construction crews and mining corporations."
Expand Down
26 changes: 26 additions & 0 deletions code/modules/clothing/spacesuits/rig/suits/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,32 @@
/obj/item/clothing/head/helmet/space/rig/eva/pirate
camera = /obj/machinery/camera/network/mercenary

/obj/item/rig/eva/pilot
name = "pilot suit control module"
suit_type = "Pilot hardsuit"
desc = "A light hardsuit issued to SCC pilots, known as the wyvern hardsuit. It features light armor designed to protect the wearer from flak and shrapnel."
icon = 'icons/clothing/rig/pilotsuit.dmi'
icon_state = "pilot_rig"
icon_supported_species_tags = list("ipc", "skr", "taj", "una")
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_SMALL,
bomb = ARMOR_BOMB_RESISTANT,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SHIELDED
)

/obj/item/rig/eva/pilot/equipped

req_access = list(access_bridge_crew)

initial_modules = list(
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/cooling_unit
)

/obj/item/rig/ce
name = "advanced voidsuit control module"
suit_type = "advanced voidsuit"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/research/designs/circuit/hardsuit_circuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
req_tech = list(TECH_DATA = 3)
build_path = /obj/item/circuitboard/rig_assembly/civilian/eva

/datum/design/circuit/hardsuit/eva/pilot
name = "pilot suit central circuit Board"
req_tech = list(TECH_DATA = 3)
build_path = /obj/item/circuitboard/rig_assembly/civilian/eva/pilot

/datum/design/circuit/hardsuit/ce
name = "Advanced Voidsuit Central Circuit Board"
req_tech = list(TECH_DATA = 4)
Expand Down
41 changes: 41 additions & 0 deletions html/changelogs/dansemacabre-fighterace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: TheDanseMacabre

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "The Canary now has two interior hand rails, two special SCC pilot hardsuits, and a box of inflatables."
Binary file added icons/clothing/rig/pilotsuit.dmi
Binary file not shown.
23 changes: 22 additions & 1 deletion maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7911,6 +7911,9 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/obj/structure/bed/handrail{
dir = 8
},
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"fFj" = (
Expand Down Expand Up @@ -17152,6 +17155,9 @@
/obj/effect/floor_decal/corner/blue{
dir = 6
},
/obj/structure/bed/handrail{
dir = 8
},
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"mhb" = (
Expand Down Expand Up @@ -18485,7 +18491,6 @@
pixel_y = 12;
tag_door = "canary_out"
},
/obj/machinery/suit_storage_unit/standard_unit,
/obj/item/device/gps/stationary/sccv_canary{
pixel_x = 23;
pixel_y = -9
Expand All @@ -18502,6 +18507,21 @@
pixel_x = -23;
pixel_y = 4
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced,
/obj/machinery/door/window/westleft{
name = "EVA Suit Storage Rack Access"
},
/obj/structure/table/rack,
/obj/item/rig/eva/pilot/equipped,
/obj/item/rig/eva/pilot/equipped{
pixel_x = -5
},
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"ncq" = (
Expand Down Expand Up @@ -26721,6 +26741,7 @@
c_tag = "Canary - Main Compartment";
dir = 1
},
/obj/item/storage/bag/inflatable,
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"sWq" = (
Expand Down

0 comments on commit 3308daa

Please sign in to comment.