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/modules/holodeck/area_copy.dm
+3 -3
View File
@@ -33,9 +33,9 @@
if(istype(O,/obj/machinery))
var/obj/machinery/M = O
M.power_change()
if(holoitem)
O.flags |= HOLOGRAM
SET_SECONDARY_FLAG(O, HOLOGRAM)
return O
@@ -105,7 +105,7 @@
var/mob/SM = DuplicateObject(M , perfectcopy=TRUE, newloc = B, holoitem=TRUE)
copiedobjs += SM.GetAllContents()
var/global/list/forbidden_vars = list("type","stat","loc","locs","vars", "parent", "parent_type","verbs","ckey","key","x","y","z","contents", "luminosity")
var/global/list/forbidden_vars = list("type","stat","loc","locs","vars", "parent", "parent_type","verbs","ckey","key","x","y","z","contents", "light_range", "light_power", "light_color", "light", "light_sources")
for(var/V in T.vars - forbidden_vars)
if(V == "air")
var/turf/open/O1 = B
code/modules/holodeck/computer.dm
+3 -3
View File
@@ -180,12 +180,12 @@
/obj/machinery/computer/holodeck/emag_act(mob/user as mob)
if(!emagged)
if(!emag_programs.len)
user << "[src] does not seem to have a card swipe port. It must be an inferior model."
to_chat(user, "[src] does not seem to have a card swipe port. It must be an inferior model.")
return
playsound(loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "<span class='warning'>You vastly increase projector power and override the safety and security protocols.</span>"
user << "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator."
to_chat(user, "<span class='warning'>You vastly increase projector power and override the safety and security protocols.</span>")
to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
log_game("[key_name(user)] emagged the Holodeck Control Console")
updateUsrDialog()
nerf(!emagged)
code/modules/holodeck/computer_funcs.dm
+1 -1
View File
@@ -52,7 +52,7 @@
if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve
return
if(get_dist(usr,src) <= 3)
usr << "<span class='warning'>ERROR. Recalibrating projection apparatus.</span>"
to_chat(usr, "<span class='warning'>ERROR. Recalibrating projection apparatus.</span>")
return
last_change = world.time
code/modules/holodeck/items.dm
+9 -9
View File
@@ -52,14 +52,14 @@
w_class = WEIGHT_CLASS_BULKY
hitsound = 'sound/weapons/blade1.ogg'
playsound(user, 'sound/weapons/saberon.ogg', 20, 1)
user << "<span class='warning'>[src] is now active.</span>"
to_chat(user, "<span class='warning'>[src] is now active.</span>")
else
force = 3
icon_state = "sword0"
w_class = WEIGHT_CLASS_SMALL
hitsound = "swing_hit"
playsound(user, 'sound/weapons/saberoff.ogg', 20, 1)
user << "<span class='warning'>[src] can now be concealed.</span>"
to_chat(user, "<span class='warning'>[src] can now be concealed.</span>")
return
//BASKETBALL OBJECTS
@@ -109,7 +109,7 @@
if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling))
var/mob/living/L = user.pulling
if(user.grab_state < GRAB_AGGRESSIVE)
user << "<span class='warning'>You need a better grip to do that!</span>"
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
return
L.loc = src.loc
L.Weaken(5)
@@ -154,19 +154,19 @@
power_channel = ENVIRON
/obj/machinery/readybutton/attack_ai(mob/user as mob)
user << "The station AI is not to interact with these devices"
to_chat(user, "The station AI is not to interact with these devices")
return
/obj/machinery/readybutton/attack_paw(mob/user as mob)
user << "<span class='warning'>You are too primitive to use this device!</span>"
to_chat(user, "<span class='warning'>You are too primitive to use this device!</span>")
return
/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
user << "The device is a solid button, there's nothing you can do with it!"
to_chat(user, "The device is a solid button, there's nothing you can do with it!")
/obj/machinery/readybutton/attack_hand(mob/user as mob)
if(user.stat || stat & (NOPOWER|BROKEN))
user << "<span class='warning'>This device is not powered!</span>"
to_chat(user, "<span class='warning'>This device is not powered!</span>")
return
currentarea = get_area(src.loc)
@@ -174,7 +174,7 @@
qdel(src)
if(eventstarted)
usr << "<span class='warning'>The event has already begun!</span>"
to_chat(usr, "<span class='warning'>The event has already begun!</span>")
return
ready = !ready
@@ -206,7 +206,7 @@
qdel(W)
for(var/mob/M in currentarea)
M << "FIGHT!"
to_chat(M, "FIGHT!")
/obj/machinery/conveyor/holodeck
code/modules/holodeck/turfs.dm
+4 -2
View File
@@ -43,7 +43,7 @@
icon_state = "asteroid0"
/turf/open/floor/holofloor/asteroid/Initialize()
icon_state = "asteroid[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]"
icon_state = "asteroid[rand(0, 12)]"
..()
/turf/open/floor/holofloor/basalt
@@ -51,8 +51,10 @@
icon_state = "basalt0"
/turf/open/floor/holofloor/basalt/Initialize()
icon_state = "basalt[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]"
..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
set_basalt_light(src)
/turf/open/floor/holofloor/space
name = "Space"