Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eoehoma Firearms (& friends) #2315

Merged
merged 45 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
db68d5e
sprites
rye-rice Mar 9, 2023
6e37e2d
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
rye-rice Mar 9, 2023
89ea136
mobin
rye-rice Mar 9, 2023
56a2ad7
shit
rye-rice Mar 10, 2023
755227e
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Jun 19, 2023
fae1fff
various fixes
rye-rice Jun 20, 2023
0849214
prototpye
rye-rice Jun 23, 2023
253aec5
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Aug 14, 2023
d117c53
holy shit progress???
rye-rice Aug 14, 2023
795e88d
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Aug 20, 2023
8678167
FUCK: so close yet so far
rye-rice Aug 21, 2023
b28e145
YESSSS... kinda
rye-rice Aug 21, 2023
b86b7b4
sigh
rye-rice Aug 23, 2023
34452b4
AAAAAAAAAAAAAAAAAAA
rye-rice Aug 27, 2023
cb8c5f8
manufactorerstuff
rye-rice Aug 27, 2023
0a75e65
gunmanufcatorerr
rye-rice Aug 27, 2023
818bb6f
FUCK
rye-rice Aug 28, 2023
310124b
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Aug 28, 2023
3cbcaa1
migth be done? once and for all?
rye-rice Aug 28, 2023
cade113
samsungsob
rye-rice Aug 28, 2023
862123f
almost predicted it
rye-rice Aug 28, 2023
d20a26c
yeag
rye-rice Aug 29, 2023
63a1174
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Sep 3, 2023
2071c97
grammar
rye-rice Sep 3, 2023
1bf7d05
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Sep 3, 2023
5ff7e4b
balance+fix linter
rye-rice Sep 3, 2023
3dcbbc9
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Sep 16, 2023
b96ca4c
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Sep 18, 2023
9d28b1a
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Sep 24, 2023
fb546ea
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Oct 16, 2023
fc2727a
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Oct 16, 2023
09af025
Update code/modules/projectiles/guns/ballistic/assault.dm
rye-rice Oct 17, 2023
975f180
Update code/modules/projectiles/guns/ballistic/assault.dm
rye-rice Oct 17, 2023
b449502
Update code/modules/projectiles/guns/ballistic/assault.dm
rye-rice Oct 17, 2023
93a1199
Update code/modules/projectiles/guns/ballistic/assault.dm
rye-rice Oct 17, 2023
130f7dc
Update code/modules/projectiles/guns/ballistic/assault.dm
rye-rice Oct 18, 2023
65accbd
aosidhfk;jladshjk;lfds
rye-rice Oct 25, 2023
8280558
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Oct 29, 2023
516e5c3
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Oct 29, 2023
5671fa2
changes and such
rye-rice Oct 29, 2023
4173079
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Nov 9, 2023
891ed53
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Nov 15, 2023
6dcec03
Merge remote-tracking branch 'upstream/master' into eoehoma
rye-rice Nov 15, 2023
cc88a44
yeah
rye-rice Nov 15, 2023
f95ae24
Update code/modules/projectiles/guns/ballistic/assault.dm
rye-rice Nov 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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