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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space_Station_13_areas.dm
+11 -19
View File
@@ -37,7 +37,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "space"
requires_power = 1
always_unpowered = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
power_light = 0
power_equip = 0
power_environ = 0
@@ -48,14 +48,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/space/nearstation
icon_state = "space_near"
lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT
dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
/area/start
name = "start area"
icon_state = "start"
requires_power = 0
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = 1
@@ -81,7 +80,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/asteroid/artifactroom/New()
..()
SetDynamicLighting()
set_dynamic_lighting()
/area/planet/clown
name = "Clown Planet"
@@ -108,10 +107,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
'sound/ambience/ambimaint3.ogg',
'sound/ambience/ambimaint4.ogg',
'sound/ambience/ambimaint5.ogg',
'sound/ambience/ambimaint6.ogg',
'sound/ambience/ambimaint7.ogg',
'sound/ambience/ambimaint8.ogg',
'sound/ambience/ambimaint9.ogg',
'sound/voice/lowHiss2.ogg', //Xeno Breathing Hisses, Hahahaha I'm not even sorry.
'sound/voice/lowHiss3.ogg',
'sound/voice/lowHiss4.ogg')
@@ -422,8 +417,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/solar
requires_power = 0
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT
dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
valid_territory = 0
blob_allowed = FALSE
flags = NONE
@@ -927,26 +921,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ai_monitored/turret_protected/AIsatextFP
name = "AI Sat Ext"
icon_state = "storage"
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT
/area/ai_monitored/turret_protected/AIsatextFS
name = "AI Sat Ext"
icon_state = "storage"
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT
/area/ai_monitored/turret_protected/AIsatextAS
name = "AI Sat Ext"
icon_state = "storage"
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT
/area/ai_monitored/turret_protected/AIsatextAP
name = "AI Sat Ext"
icon_state = "storage"
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_IFSTARLIGHT
/area/ai_monitored/turret_protected/NewAIMain
name = "AI Main New"
@@ -999,7 +985,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Telecommunications Satellite Lounge"
icon_state = "tcomsatlounge"
/area/chapel/asteroid
name = "Chapel Asteroid"
icon_state = "explored"
/area/chapel/dock
name = "Chapel Dock"
icon_state = "construction"
/////////////////////////////////////////////////////////////////////
/*
code/game/area/areas.dm
+19 -13
View File
@@ -111,8 +111,11 @@ var/list/teleportlocs = list()
power_equip = 1
power_environ = 1
if (lighting_use_dynamic != DYNAMIC_LIGHTING_IFSTARLIGHT)
lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED
if(dynamic_lighting == DYNAMIC_LIGHTING_FORCED)
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
luminosity = 0
else if(dynamic_lighting != DYNAMIC_LIGHTING_IFSTARLIGHT)
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
..()
@@ -120,6 +123,9 @@ var/list/teleportlocs = list()
blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor.
if(!IS_DYNAMIC_LIGHTING(src))
add_overlay(/obj/effect/fullbright)
/area/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
@@ -255,6 +261,12 @@ var/list/teleportlocs = list()
for(var/area/RA in related)
RA.ModifyFiredoors(FALSE)
/area/proc/close_and_lock_door(obj/machinery/door/DOOR)
set waitfor = FALSE
DOOR.close()
if(DOOR.density)
DOOR.lock()
/area/proc/burglaralert(obj/trigger)
if(always_unpowered == 1) //no burglar alarms in space/asteroid
return
@@ -266,10 +278,7 @@ var/list/teleportlocs = list()
RA.set_fire_alarm_effect()
//Lockdown airlocks
for(var/obj/machinery/door/DOOR in RA)
spawn(0)
DOOR.close()
if(DOOR.density)
DOOR.lock()
close_and_lock_door(DOOR)
for (var/obj/machinery/camera/C in RA)
cameras += C
@@ -325,15 +334,11 @@ var/list/teleportlocs = list()
icon_state = "party"
else
icon_state = "blue-red"
invisibility = INVISIBILITY_LIGHTING
else
// new lighting behaviour with obj lights
icon_state = null
invisibility = INVISIBILITY_MAXIMUM
/area/space/updateicon()
icon_state = null
invisibility = INVISIBILITY_MAXIMUM
/*
#define EQUIP 1
@@ -413,6 +418,7 @@ var/list/teleportlocs = list()
/area/Entered(A)
set waitfor = FALSE
if(!isliving(A))
return
@@ -434,9 +440,9 @@ var/list/teleportlocs = list()
if(!L.client.played)
L << sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1)
L.client.played = 1
spawn(600) //ewww - this is very very bad
if(L.&& L.client)
L.client.played = 0
sleep(600) //ewww - this is very very bad
if(L.&& L.client)
L.client.played = 0
/atom/proc/has_gravity(turf/T)
if(!T || !isturf(T))
code/game/area/areas/away_content.dm
+7 -21
View File
@@ -21,16 +21,14 @@
/area/awaymission/beach
name = "Beach"
icon_state = "away"
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
requires_power = 0
has_gravity = 1
ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg')
/area/awaymission/errorroom
name = "Super Secret Room"
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = 1
@@ -39,8 +37,7 @@
/area/awaymission/research
name = "Research Outpost"
icon_state = "away"
luminosity = 0
lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
/area/awaymission/research/interior
name = "Research Inside"
@@ -159,15 +156,13 @@
name = "Snow Forest"
icon_state = "away"
requires_power = 0
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
/area/awaymission/cabin
name = "Cabin"
icon_state = "away2"
requires_power = 1
luminosity = 0
lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
/area/awaymission/snowforest/lumbermill
name = "Lumbermill"
@@ -178,7 +173,6 @@
/area/awaymission/BMPship
name = "BMP Asteroids"
icon_state = "away"
luminosity = 0
/area/awaymission/BMPship/Aft
@@ -234,31 +228,26 @@
/area/awaymission/wwmines
name = "Wild West Mines"
icon_state = "away1"
luminosity = 1
requires_power = 0
/area/awaymission/wwgov
name = "Wild West Mansion"
icon_state = "away2"
luminosity = 1
requires_power = 0
/area/awaymission/wwrefine
name = "Wild West Refinery"
icon_state = "away3"
luminosity = 1
requires_power = 0
/area/awaymission/wwvault
name = "Wild West Vault"
icon_state = "away3"
luminosity = 0
/area/awaymission/wwvaultdoors
name = "Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power
icon_state = "away2"
requires_power = 0
luminosity = 0
/*
@@ -327,8 +316,7 @@
name = "Snowdin Tundra Plains"
icon_state = "away"
requires_power = 0
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
/area/awaymission/snowdin/post
name = "Snowdin Outpost"
@@ -341,7 +329,6 @@
/area/awaymission/snowdin/cave
name = "Snowdin Caves"
icon_state = "away2"
luminosity = 0
/area/awaymission/snowdin/base
name = "Snowdin Main Base"
@@ -351,7 +338,6 @@
/area/awaymission/snowdin/dungeon1
name = "Snowdin Depths"
icon_state = "away2"
luminosity = 0
/area/awaymission/snowdin/sekret
name = "Snowdin Operations"
@@ -454,4 +440,4 @@
icon_state = "awaycontent29"
/area/awaycontent/a30
icon_state = "awaycontent30"
icon_state = "awaycontent30"
code/game/area/areas/centcom.dm
+6
View File
@@ -4,6 +4,7 @@
/area/centcom
name = "Centcom"
icon_state = "centcom"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = 0
has_gravity = 1
noteleport = 1
@@ -33,16 +34,19 @@
/area/tdome
name = "Thunderdome"
icon_state = "yellow"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = 0
has_gravity = 1
/area/tdome/arena
name = "Thunderdome Arena"
icon_state = "thunder"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/tdome/arena_source
name = "Thunderdome Arena Template"
icon_state = "thunder"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/tdome/tdome1
name = "Thunderdome (Team 1)"
@@ -67,6 +71,7 @@
/area/wizard_station
name = "Wizard's Den"
icon_state = "yellow"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = 0
has_gravity = 1
noteleport = 1
@@ -91,6 +96,7 @@
/area/syndicate_mothership/control
name = "Syndicate Control Room"
icon_state = "syndie-control"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/syndicate_mothership/elite_squad
name = "Syndicate Elite Squad"
code/game/area/areas/holodeck.dm
+1 -3
View File
@@ -1,8 +1,7 @@
/area/holodeck
name = "Holodeck"
icon_state = "Holodeck"
luminosity = 1
lighting_use_dynamic = 0
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
flags = 0
var/obj/machinery/computer/holodeck/linked
@@ -125,4 +124,3 @@
/area/holodeck/rec_center/thunderdome1218
name = "Holodeck - 1218 AD"
restricted = 1
code/game/area/areas/ruins.dm
+1 -1
View File
@@ -113,7 +113,7 @@
icon_state = "space"
requires_power = 1
always_unpowered = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_DISABLED
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = 0
power_light = 0
power_equip = 0
code/game/area/areas/shuttles.dm
+1 -2
View File
@@ -4,8 +4,7 @@
/area/shuttle
name = "Shuttle"
requires_power = 0
luminosity = 1
lighting_use_dynamic = DYNAMIC_LIGHTING_ENABLED
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
has_gravity = 1
always_unpowered = 0
valid_territory = 0