shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

Browse Source 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
This commit is contained in:
CitadelStationBot
2017-08-02 04:56:44 -05:00
committed by Poojawa
parent 76f7fcef9a
commit 8a4ddbe8a8
74 changed files with 62713 additions and 61428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/misc_floor.dm
+7 -1
View File
@@ -49,6 +49,9 @@
/turf/open/floor/circuit/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/circuit/telecomms/mainframe
name = "Mainframe Base"
/turf/open/floor/circuit/green
icon_state = "gcircuit"
icon_normal = "gcircuit"
@@ -70,6 +73,9 @@
/turf/open/floor/circuit/green/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/circuit/green/telecomms/mainframe
name = "Mainframe Base"
/turf/open/floor/circuit/red
icon_state = "rcircuit"
icon_normal = "rcircuit"
@@ -265,4 +271,4 @@
//Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't
for(var/obj/structure/spacevine/SV in src)
if(!QDESTROYING(SV))//Helps avoid recursive loops
qdel(SV)
qdel(SV)
code/game/turfs/simulated/floor/plasteel_floor.dm
+30
View File
@@ -17,6 +17,10 @@
/turf/open/floor/plasteel/black
icon_state = "dark"
/turf/open/floor/plasteel/black/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/black/telecomms/mainframe
name = "Mainframe Floor"
/turf/open/floor/plasteel/airless/black
icon_state = "dark"
/turf/open/floor/plasteel/black/side
@@ -43,6 +47,10 @@
/turf/open/floor/plasteel/brown
icon_state = "brown"
/turf/open/floor/plasteel/brown/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/brown/telecomms/mainframe
name = "Mainframe Floor"
/turf/open/floor/plasteel/brown/corner
icon_state = "browncorner"
@@ -59,6 +67,8 @@
icon_state = "greenfull"
/turf/open/floor/plasteel/green/side
icon_state = "green"
/turf/open/floor/plasteel/green/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/green/corner
icon_state = "greencorner"
@@ -66,6 +76,8 @@
icon_state = "darkgreenfull"
/turf/open/floor/plasteel/darkgreen/side
icon_state = "darkgreen"
/turf/open/floor/plasteel/darkgreen/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/darkgreen/corner
icon_state = "darkgreencorners"
@@ -89,6 +101,8 @@
icon_state = "darkredfull"
/turf/open/floor/plasteel/darkred/side
icon_state = "darkred"
/turf/open/floor/plasteel/darkred/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/darkred/corner
icon_state = "darkredcorners"
@@ -112,6 +126,8 @@
icon_state = "darkbluefull"
/turf/open/floor/plasteel/darkblue/side
icon_state = "darkblue"
/turf/open/floor/plasteel/darkblue/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/darkblue/corner
icon_state = "darkbluecorners"
@@ -119,6 +135,8 @@
icon_state = "whitebluefull"
/turf/open/floor/plasteel/whiteblue/side
icon_state = "whiteblue"
/turf/open/floor/plasteel/whiteblue/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/whiteblue/corner
icon_state = "whitebluecorner"
@@ -135,6 +153,8 @@
icon_state = "darkyellowfull"
/turf/open/floor/plasteel/darkyellow/side
icon_state = "darkyellow"
/turf/open/floor/plasteel/darkyellow/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/darkyellow/corner
icon_state = "darkyellowcorners"
@@ -158,6 +178,8 @@
icon_state = "darkpurplefull"
/turf/open/floor/plasteel/darkpurple/side
icon_state = "darkpurple"
/turf/open/floor/plasteel/darkpurple/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/darkpurple/corner
icon_state = "darkpurplecorners"
@@ -165,6 +187,8 @@
icon_state = "whitepurplefull"
/turf/open/floor/plasteel/whitepurple/side
icon_state = "whitepurple"
/turf/open/floor/plasteel/whitepurple/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/whitepurple/corner
icon_state = "whitepurplecorner"
@@ -181,6 +205,8 @@
icon_state = "neutralfull"
/turf/open/floor/plasteel/neutral/side
icon_state = "neutral"
/turf/open/floor/plasteel/neutral/side/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/neutral/corner
icon_state = "neutralcorner"
@@ -325,6 +351,10 @@
/turf/open/floor/plasteel/vault
icon_state = "vault"
/turf/open/floor/plasteel/vault/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/vault/telecomms/mainframe
name = "Mainframe Floor"
/turf/open/floor/plasteel/cult
icon_state = "cult"
code/game/turfs/turf.dm
+24 -13
View File
@@ -9,7 +9,7 @@
var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
var/blocks_air = 0
var/blocks_air = FALSE
flags = CAN_BE_DIRTY
@@ -84,16 +84,28 @@
/turf/attack_hand(mob/user)
user.Move_Pulled(src)
/turf/proc/handleRCL(obj/item/weapon/twohanded/rcl/C, mob/user)
if(C.loaded)
for(var/obj/structure/cable/LC in src)
if(!LC.d1 || !LC.d2)
LC.handlecable(C, user)
return
C.loaded.place_turf(src, user)
C.is_empty(user)
/turf/attackby(obj/item/C, mob/user, params)
if(can_lay_cable() && istype(C, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = C
for(var/obj/structure/cable/LC in src)
if((LC.d1==0)||(LC.d2==0))
if(!LC.d1 || !LC.d2)
LC.attackby(C,user)
return
coil.place_turf(src, user)
return TRUE
else if(istype(C, /obj/item/weapon/twohanded/rcl))
handleRCL(C, user)
return FALSE
/turf/CanPass(atom/movable/mover, turf/target)
@@ -117,7 +129,7 @@
return FALSE
var/list/large_dense = list()
//Next, check objects to block entry that are on the border
for(var/atom/movable/border_obstacle in src)
if(border_obstacle.flags & ON_BORDER)
@@ -134,7 +146,7 @@
//Finally, check objects/mobs to block entry that are not on the border
var/atom/movable/tompost_bump
var/top_layer = 0
var/top_layer = FALSE
for(var/atom/movable/obstacle in large_dense)
if(!obstacle.CanPass(mover, mover.loc, 1) && (forget != obstacle))
if(obstacle.layer > top_layer)
@@ -197,14 +209,14 @@
qdel(L)
//wrapper for ChangeTurf()s that you want to prevent/affect without overriding ChangeTurf() itself
/turf/proc/TerraformTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE)
return ChangeTurf(path, new_baseturf, defer_change, ignore_air)
/turf/proc/TerraformTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
return ChangeTurf(path, new_baseturf, defer_change, ignore_air, forceop)
//Creates a new turf
/turf/proc/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE)
/turf/proc/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
if(!path)
return
if(!GLOB.use_preloader && path == type) // Don't no-op if the map loader requires it to be reconstructed
if(!GLOB.use_preloader && path == type && !forceop) // Don't no-op if the map loader requires it to be reconstructed
return src
var/old_baseturf = baseturf
@@ -416,8 +428,8 @@
var/thing = allowed_contents[i]
qdel(thing, force=TRUE)
var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE)
var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE, forceop = forceop)
SSair.remove_from_active(newT)
newT.CalculateAdjacentTurfs()
SSair.add_to_active(newT,1)
@@ -425,13 +437,12 @@
/turf/proc/is_transition_turf()
return
/turf/acid_act(acidpwr, acid_volume)
. = 1
var/acid_type = /obj/effect/acid
if(acidpwr >= 200) //alien acid power
acid_type = /obj/effect/acid/alien
var/has_acid_effect = 0
var/has_acid_effect = FALSE
for(var/obj/O in src)
if(intact && O.level == 1) //hidden under the floor
continue
@@ -503,4 +514,4 @@
limit--
else
return I
return I
return I
code/game/turfs/turf.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm (rejected hunks)
@@ -410,7 +410,7 @@
/turf/proc/empty(turf_type=/turf/open/space, baseturf_type)
// Remove all atoms except observers, landmarks, docking ports
var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
- var/list/allowed_contents = typecache_filter_list(GetAllContents(),ignored_atoms,reversed=TRUE)
+ var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(),ignored_atoms)
allowed_contents -= src
for(var/i in 1 to allowed_contents.len)
var/thing = allowed_contents[i]