Skip to content

Commit

Permalink
Electric Welder & Cell Component (shiptest-ss13#3519)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Mostly port of Skyrat-SS13/Skyrat-tg#4900
Electric welder from Nova Sector

Removes the old experimental welder and replaces it with a
battery-operated welding tool.

![image](https://github.com/user-attachments/assets/30c9bfd9-1e4f-428c-8aaa-73e129b29f93)
Sprite base by rye and finished by me
Also adds a cell component, allowing an easy way to add a functional
cell to any item.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl:
add: Added a new electric welder - buy it from the outpost.
del: Removed experimental welder
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: thgvr <[email protected]>
Signed-off-by: Sun-Soaked <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
  • Loading branch information
3 people authored Dec 7, 2024
1 parent 952a0b4 commit bd066a3
Show file tree
Hide file tree
Showing 40 changed files with 1,284 additions and 1,022 deletions.
77 changes: 38 additions & 39 deletions _maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -939,26 +939,6 @@
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"oI" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 6
},
/obj/effect/turf_decal/corner/opaque/green{
dir = 1
},
/obj/structure/window/reinforced/spawner{
dir = 4
},
/obj/structure/table_frame,
/obj/item/shard{
icon_state = "small";
pixel_x = -2;
pixel_y = 11
},
/obj/effect/gibspawner/human,
/obj/item/ammo_box/magazine/skm_46_30,
/turf/open/floor/plasteel/tech,
/area/ship/science)
"oJ" = (
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
Expand Down Expand Up @@ -1149,6 +1129,16 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/science)
"rX" = (
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 10
},
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 1
},
/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"sc" = (
/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
dir = 6
Expand Down Expand Up @@ -1588,6 +1578,11 @@
},
/turf/open/floor/plasteel/white,
/area/ship/science/storage)
"zU" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/grass,
/area/overmap_encounter/planetoid/jungle/explored)
"Av" = (
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 5
Expand Down Expand Up @@ -2101,16 +2096,6 @@
},
/turf/open/floor/plasteel/white,
/area/ship/science)
"Ib" = (
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 10
},
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 1
},
/obj/effect/spawner/random/vending/snack,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"Ie" = (
/obj/structure/railing{
dir = 6
Expand Down Expand Up @@ -2438,12 +2423,6 @@
},
/turf/open/floor/plasteel/white,
/area/ship/science/storage)
"MB" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/decal/cleanable/blood/splatter,
/obj/item/weldingtool/experimental,
/turf/open/floor/grass,
/area/overmap_encounter/planetoid/jungle/explored)
"MF" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 9
Expand Down Expand Up @@ -2755,6 +2734,26 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"QO" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 6
},
/obj/effect/turf_decal/corner/opaque/green{
dir = 1
},
/obj/structure/window/reinforced/spawner{
dir = 4
},
/obj/structure/table_frame,
/obj/item/shard{
icon_state = "small";
pixel_x = -2;
pixel_y = 11
},
/obj/effect/gibspawner/human,
/obj/item/ammo_box/magazine/skm_46_30,
/turf/open/floor/plasteel/tech,
/area/ship/science)
"QY" = (
/turf/open/floor/plasteel/tech,
/area/ship/medical)
Expand Down Expand Up @@ -3647,7 +3646,7 @@ nr
Zq
NT
RV
Ib
rX
Zq
ar
kP
Expand Down Expand Up @@ -3940,7 +3939,7 @@ Sh
fC
SQ
Cv
MB
zU
jl
Wo
Av
Expand Down Expand Up @@ -4239,7 +4238,7 @@ Er
RG
nx
ve
oI
QO
Rm
wQ
Bc
Expand Down
Loading

0 comments on commit bd066a3

Please sign in to comment.