mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Ports the NTSS Raven from TG station. Slightly remaps delta escape / faragus escape (#24567)
* R A V E N * docking ports. Delta needs tweak * yep * raven generators, increased range / anchored * names / fixes wrong generators * decore / missing decal * NTSSS RAVEN * purge this * oops * should be good * Update code/modules/mob/living/simple_animal/friendly/mouse.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
co-authored by
Henri215
parent
af44d08917
commit
9096c5f0b9
+501
-434
File diff suppressed because it is too large
Load Diff
@@ -43030,11 +43030,11 @@
|
||||
"cZp" = (
|
||||
/obj/docking_port/stationary{
|
||||
dir = 2;
|
||||
dwidth = 11;
|
||||
height = 18;
|
||||
dwidth = 15;
|
||||
height = 21;
|
||||
id = "emergency_home";
|
||||
name = "emergency evac bay";
|
||||
width = 29
|
||||
width = 32
|
||||
},
|
||||
/turf/space,
|
||||
/area/space)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -23109,11 +23109,11 @@
|
||||
"brK" = (
|
||||
/obj/docking_port/stationary{
|
||||
dir = 4;
|
||||
dwidth = 11;
|
||||
height = 18;
|
||||
dwidth = 15;
|
||||
height = 21;
|
||||
id = "emergency_home";
|
||||
name = "emergency evac bay";
|
||||
width = 29
|
||||
width = 32
|
||||
},
|
||||
/turf/space,
|
||||
/area/space)
|
||||
|
||||
@@ -1476,17 +1476,6 @@
|
||||
icon_state = "dark"
|
||||
},
|
||||
/area/ghost_bar)
|
||||
"fH" = (
|
||||
/obj/docking_port/stationary/transit{
|
||||
dir = 4;
|
||||
dwidth = 11;
|
||||
height = 13;
|
||||
id = "emergency_transit";
|
||||
name = "emergency in transit";
|
||||
width = 24
|
||||
},
|
||||
/turf/space/transit,
|
||||
/area/space/centcomm)
|
||||
"fI" = (
|
||||
/turf/simulated/wall/indestructible/riveted,
|
||||
/area/tdome/arena_source)
|
||||
@@ -2889,12 +2878,12 @@
|
||||
"kf" = (
|
||||
/obj/docking_port/stationary{
|
||||
area_type = /area/syndicate_mothership;
|
||||
dwidth = 11;
|
||||
height = 18;
|
||||
dwidth = 15;
|
||||
height = 21;
|
||||
id = "emergency_syndicate";
|
||||
name = "404 Not Found";
|
||||
turf_type = /turf/simulated/floor/plating/asteroid/snow/airless;
|
||||
width = 29
|
||||
width = 32
|
||||
},
|
||||
/turf/simulated/floor/plating/asteroid/snow/airless,
|
||||
/area/syndicate_mothership)
|
||||
@@ -4505,6 +4494,17 @@
|
||||
icon_state = "vault"
|
||||
},
|
||||
/area/tdome/tdomeadmin)
|
||||
"pf" = (
|
||||
/obj/docking_port/stationary/transit{
|
||||
dir = 4;
|
||||
dwidth = 15;
|
||||
height = 21;
|
||||
id = "emergency_transit";
|
||||
name = "emergency in transit";
|
||||
width = 32
|
||||
},
|
||||
/turf/space/transit,
|
||||
/area/space/centcomm)
|
||||
"pg" = (
|
||||
/obj/machinery/door/airlock/titanium/glass{
|
||||
name = "trader shuttle airlock";
|
||||
@@ -12205,11 +12205,11 @@
|
||||
},
|
||||
/obj/docking_port/stationary{
|
||||
dir = 4;
|
||||
dwidth = 11;
|
||||
height = 18;
|
||||
dwidth = 15;
|
||||
height = 21;
|
||||
id = "emergency_away";
|
||||
name = "emergency centcom";
|
||||
width = 29
|
||||
width = 32
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/escape)
|
||||
@@ -16366,7 +16366,7 @@ ck
|
||||
ck
|
||||
ck
|
||||
ck
|
||||
ck
|
||||
pf
|
||||
ck
|
||||
ck
|
||||
ck
|
||||
@@ -17137,7 +17137,7 @@ ck
|
||||
ck
|
||||
ck
|
||||
ck
|
||||
fH
|
||||
ck
|
||||
ck
|
||||
ck
|
||||
ck
|
||||
@@ -49367,7 +49367,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -50399,7 +50399,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -50429,7 +50429,7 @@ Pb
|
||||
vy
|
||||
Iv
|
||||
Zp
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -50652,7 +50652,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -50686,7 +50686,7 @@ XB
|
||||
od
|
||||
ux
|
||||
ux
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -51684,7 +51684,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
vy
|
||||
Ew
|
||||
Fq
|
||||
@@ -51714,7 +51714,7 @@ Pb
|
||||
vy
|
||||
Iv
|
||||
Zp
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -51937,11 +51937,11 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
vy
|
||||
Ez
|
||||
Fq
|
||||
@@ -52451,7 +52451,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -52485,7 +52485,7 @@ JC
|
||||
vy
|
||||
Iv
|
||||
Zp
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -53226,7 +53226,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -53256,7 +53256,7 @@ YT
|
||||
vy
|
||||
Iv
|
||||
Zp
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -53736,7 +53736,7 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -53770,7 +53770,7 @@ qF
|
||||
od
|
||||
Iv
|
||||
Zp
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -54254,37 +54254,37 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
@@ -55021,41 +55021,41 @@ aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
Db
|
||||
aN
|
||||
aN
|
||||
aN
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -111,6 +111,14 @@
|
||||
name = "Emergency shuttle JUNG-13"
|
||||
description = "You can hear screeching and hissing as this shuttle docks."
|
||||
|
||||
/datum/map_template/shuttle/emergency/raven
|
||||
suffix = "raven"
|
||||
name = "CentCom Raven Cruiser"
|
||||
description = "The CentCom Raven Cruiser is a former high-risk salvage vessel, now repurposed into an emergency escape shuttle. \
|
||||
Once first to the scene to pick through warzones for valuable remains, it now serves as an excellent escape option for stations under heavy fire from outside forces. \
|
||||
This escape shuttle boasts shields and numerous anti-personnel turrets guarding its perimeter to fend off meteors and enemy boarding attempts."
|
||||
admin_notes = "Comes with turrets that will target simple mobs."
|
||||
|
||||
/datum/map_template/shuttle/ferry/base
|
||||
suffix = "base"
|
||||
name = "transport ferry"
|
||||
|
||||
@@ -140,6 +140,7 @@
|
||||
var/list/deployed_shields = list()
|
||||
var/is_open = FALSE //Whether or not the wires are exposed
|
||||
var/locked = FALSE
|
||||
var/shield_range = 2
|
||||
|
||||
/obj/machinery/shieldgen/Destroy()
|
||||
QDEL_LIST_CONTENTS(deployed_shields)
|
||||
@@ -155,7 +156,7 @@
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
anchored = TRUE
|
||||
|
||||
for(var/turf/target_tile in range(2, src))
|
||||
for(var/turf/target_tile in range(shield_range, src))
|
||||
if(isspaceturf(target_tile) && !(locate(/obj/machinery/shield) in target_tile))
|
||||
if(malfunction && prob(33) || !malfunction)
|
||||
var/obj/machinery/shield/new_shield = new(target_tile)
|
||||
@@ -295,6 +296,12 @@
|
||||
/obj/machinery/shieldgen/update_icon_state()
|
||||
icon_state = "shield[active ? "on" : "off"][malfunction ? "br" : ""]"
|
||||
|
||||
/obj/machinery/shieldgen/raven
|
||||
name = "military shield generator"
|
||||
desc = "Military grade shield generators used to protect spaceships from incoming fire."
|
||||
shield_range = 4
|
||||
anchored = TRUE
|
||||
|
||||
////FIELD GEN START //shameless copypasta from fieldgen, powersink, and grille
|
||||
#define MAX_STORED_POWER 500
|
||||
/obj/machinery/shieldwallgen
|
||||
|
||||
@@ -198,3 +198,33 @@
|
||||
|
||||
/obj/effect/turf_decal/siding/box
|
||||
icon_state = "siding_box"
|
||||
|
||||
/obj/effect/turf_decal/raven_ship_sign
|
||||
icon_state = "RAVEN2"
|
||||
|
||||
/obj/effect/turf_decal/raven/one
|
||||
icon_state = "RAVEN1"
|
||||
|
||||
/obj/effect/turf_decal/raven/two
|
||||
icon_state = "RAVEN2"
|
||||
|
||||
/obj/effect/turf_decal/raven/three
|
||||
icon_state = "RAVEN3"
|
||||
|
||||
/obj/effect/turf_decal/raven/four
|
||||
icon_state = "RAVEN4"
|
||||
|
||||
/obj/effect/turf_decal/raven/five
|
||||
icon_state = "RAVEN5"
|
||||
|
||||
/obj/effect/turf_decal/raven/six
|
||||
icon_state = "RAVEN6"
|
||||
|
||||
/obj/effect/turf_decal/raven/seven
|
||||
icon_state = "RAVEN7"
|
||||
|
||||
/obj/effect/turf_decal/raven/eight
|
||||
icon_state = "RAVEN8"
|
||||
|
||||
/obj/effect/turf_decal/raven/nine
|
||||
icon_state = "RAVEN9"
|
||||
|
||||
@@ -158,6 +158,17 @@
|
||||
// Tom fears no cable.
|
||||
ADD_TRAIT(src, TRAIT_SHOCKIMMUNE, SPECIES_TRAIT)
|
||||
|
||||
/mob/living/simple_animal/mouse/white/Brain
|
||||
name = "Brain"
|
||||
real_name = "Brain"
|
||||
response_harm = "splats"
|
||||
unique_pet = TRUE
|
||||
gold_core_spawnable = NO_SPAWN
|
||||
|
||||
/mob/living/simple_animal/mouse/white/Brain/update_desc()
|
||||
. = ..()
|
||||
desc = "Gee Virology, what are we going to do tonight? The same thing we do every night, try to take over the world!"
|
||||
|
||||
/mob/living/simple_animal/mouse/blobinfected
|
||||
maxHealth = 100
|
||||
health = 100
|
||||
|
||||
@@ -83,14 +83,18 @@
|
||||
cost = 3750
|
||||
template = /datum/map_template/shuttle/emergency/cramped
|
||||
|
||||
// these, otoh, have some pretty silly features, and are hidden behind emag
|
||||
|
||||
/datum/supply_packs/abstract/shuttle/military
|
||||
// if you can pool enough money together for this one, maybe you deserve it
|
||||
speed_factor = 1.5
|
||||
cost = 4250
|
||||
cost = 3500
|
||||
template = /datum/map_template/shuttle/emergency/military
|
||||
|
||||
// if you can pool enough money together for this one, maybe you deserve it
|
||||
|
||||
/datum/supply_packs/abstract/shuttle/raven
|
||||
cost = 4500 //I do wonder about shuttle prices, especially considering how many guns you could get for this price. Perhaps a lowering in the future.
|
||||
template = /datum/map_template/shuttle/emergency/raven
|
||||
|
||||
// these, otoh, have some pretty silly features, and are hidden behind emag
|
||||
|
||||
/datum/supply_packs/abstract/shuttle/clown
|
||||
speed_factor = 0.75 // this one's a little slower, enjoy your ride!
|
||||
cmag_hidden = TRUE
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 73 KiB |
Reference in New Issue
Block a user