Skip to content

Commit

Permalink
Eoehoma Firearms (& friends) (#2315)
Browse files Browse the repository at this point in the history
## About The Pull Request


![Screenshot_5451](https://github.com/shiptest-ss13/Shiptest/assets/58402542/08f9b0ee-15db-4091-a974-6d887cd85259)

Holy shit, this should not have taken a year to make

Adds the E-10, E-11, E-40, E-50, and E-60 to the game. Weapons
manufactured by defunct firearms company Eoehoma Firearms.

Founded in 77 FS, Eoehoma was a early pioneer of ‘hybrid’ Solarian and
Kalixcian laser weapons. The company went bankrupt due to increasingly
poor and risky decision making, and all of it's patents were bought out
by Nanotrasen. While Nanotrasen's Emitters bear a striking resemblance
to the E-50, otherwise Nanotrasen has not produced any of Eoehoma's old
weapons, instead focusing on Sharplite designed weapons.

Other changes:
- NT and Sharplite weapons have different fire sounds from each other
- Laser weapons buffed to 20 -> 25 damage
- Pulse shots don't destroy walls and are now 50 -> 40 damage
- Emitter shots now do 30 -> 60 damage
- Various grammar fixes
- Removes some non-lore compliant mentions
- Adds a manufacturer indicator to many guns
- Ports tgstation/tgstation#60353
- Resprites various laser weaponry, notably the pulse guns.
- Deathsquad and ERT/LP hardsuits have been redone

## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/c5df7029-95da-4041-b8b1-e4cfd35436dd)

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/f72a3672-e996-4fdd-a68d-4553655f1a0c)

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/7bd2dc53-ab29-49e8-8f90-87d4c72583f9)

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/4bdc6493-4c94-49d0-995b-2a450d738211)
ceredits to tetrazeta for the unfinished deathsquad sprite, i simply
finished it and touched it up

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/517b72e3-c72b-4875-a6fb-84c017105908)

One of the last things i remember the old leads planned was to buff
lasers to make them stand up to the various ballistics better. Also
allows Pulse Rifles to be more used in events by nerfing them to not be
comedically overpowered. Now they are just Overpowered.

More ruin content and such. I'm sure the maptainers will make good use
of this stuff.

And sprites, i fucking love sprites

## Changelog

:cl: retlaw34, tetrazeta
add: Eoehoma Firearms, a new guns manufacturer!
add: ERT and "Asset Protection" Hardsuits have gotten a new look!
add: New laser fire sounds

balance: Lasers now do slightly more damage
balance: Pulse rifles don't destroy walls anymore and do slightly less
damage, and have lost their stun mode.
balance: Emitters do 60 damage and create turf fires on hitting a
non-supermatter object.
fix: Various laser weapons that had broken autofire (E-TAR and the Tesla
Cannon) now work

spellcheck: Grammar on some descriptions was corrected.
/: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: retlaw34 <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: thgvr <[email protected]>
  • Loading branch information
3 people authored Nov 18, 2023
1 parent 70b0fad commit 223dc74
Show file tree
Hide file tree
Showing 55 changed files with 2,154 additions and 1,753 deletions.
120 changes: 60 additions & 60 deletions _maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2601,26 +2601,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/kitchen)
"hX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/corner/opaque/red,
/obj/effect/turf_decal/corner/opaque/red{
dir = 4
},
/obj/structure/sign/poster/retro/lasergun{
pixel_x = 32
},
/obj/item/gun/energy/laser/retro/old{
pixel_x = -2;
pixel_y = -2
},
/obj/item/gun/energy/laser/retro/old{
pixel_x = 2;
pixel_y = 2
},
/obj/structure/rack,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/sec)
"hY" = (
/obj/structure/chair,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -4087,6 +4067,34 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/rnd)
"lO" = (
/obj/structure/table,
/obj/item/storage/firstaid/ancient,
/obj/effect/decal/cleanable/dirt,
/obj/item/defibrillator,
/obj/item/paper/fluff/ruins/oldstation/protosleep{
default_raw_text = "<b>*Prototype Sleeper*</b><br><br>We have deliverted the lastest in medical technology to the medical bay for your use."
},
/obj/machinery/power/apc{
dir = 1;
name = "Beta Station Medbay APC";
pixel_y = 23;
start_charge = 0
},
/obj/effect/turf_decal/corner/opaque/blue,
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/blue{
dir = 1
},
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/floor/plasteel/airless{
initial_gas_mix = "ICEMOON_ATMOS"
},
/area/ruin/space/has_grav/ancientstation/medbay)
"lQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
Expand Down Expand Up @@ -4236,34 +4244,6 @@
/obj/item/pipe_dispenser,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/mining)
"mu" = (
/obj/structure/table,
/obj/item/storage/firstaid/ancient,
/obj/effect/decal/cleanable/dirt,
/obj/item/defibrillator,
/obj/item/paper/fluff/ruins/oldstation/protosleep{
default_raw_text = "<b>*Prototype Sleeper*</b><br><br>We have deliverted the lastest in medical technology to the medical bay for your use."
},
/obj/machinery/power/apc{
dir = 1;
name = "Beta Station Medbay APC";
pixel_y = 23;
start_charge = 0
},
/obj/effect/turf_decal/corner/opaque/blue,
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/blue{
dir = 1
},
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/floor/plasteel/airless{
initial_gas_mix = "ICEMOON_ATMOS"
},
/area/ruin/space/has_grav/ancientstation/medbay)
"mv" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 8
Expand Down Expand Up @@ -5816,6 +5796,15 @@
initial_gas_mix = "ICEMOON_ATMOS"
},
/area/ruin/space/has_grav/ancientstation/medbay)
"vr" = (
/obj/machinery/light/directional/east,
/obj/structure/table/reinforced,
/obj/item/paper/fluff/ruins/oldstation/protosing{
default_raw_text = "fucking uhhh tesla -I'll finish this later, Professor Fiddler";
name = "Tesla Generator"
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/proto)
"vs" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
Expand Down Expand Up @@ -7738,6 +7727,26 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation)
"Nz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/corner/opaque/red,
/obj/effect/turf_decal/corner/opaque/red{
dir = 4
},
/obj/structure/sign/poster/retro/lasergun{
pixel_x = 32
},
/obj/item/gun/energy/laser/retro{
pixel_x = -2;
pixel_y = -2
},
/obj/item/gun/energy/laser/retro{
pixel_x = 2;
pixel_y = 2
},
/obj/structure/rack,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/sec)
"NC" = (
/obj/machinery/power/smes/engineering{
charge = 0
Expand Down Expand Up @@ -8450,15 +8459,6 @@
/obj/effect/spawner/lootdrop/maintenance/seven,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/hydroponics)
"UT" = (
/obj/machinery/light/directional/east,
/obj/structure/table/reinforced,
/obj/item/paper/fluff/ruins/oldstation/protosing{
default_raw_text = "fucking uhhh tesla -I'll finish this later, Professor Fiddler";
name = "Tesla Generator"
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/proto)
"UV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -9033,7 +9033,7 @@ ch
Sd
je
AK
mu
lO
dD
kb
eH
Expand Down Expand Up @@ -11443,7 +11443,7 @@ fO
fO
MI
wd
hX
Nz
im
eJ
lg
Expand Down Expand Up @@ -12530,7 +12530,7 @@ Yr
ca
jA
mm
UT
vr
jA
GF
lc
Expand Down
Loading

0 comments on commit 223dc74

Please sign in to comment.