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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

Browse Source
This commit is contained in:
SandPoot
2024-03-08 19:10:22 -03:00
parent fcd036dab5 c4c3a8ace1
commit a65f323734
810 changed files with 140372 additions and 5523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/verbs/who.dm
+5 -5
View File
@@ -38,7 +38,7 @@
var/client/C = X
if(C && C.holder && !C.holder.fakekey)
assembled += "\t <font color='#FF0000'>[C.key]</font>[admin_mode? "[show_admin_info(C)]":""] ([round(C.avgping, 1)]ms)"
Lines += sortList(assembled)
Lines += sort_list(assembled)
assembled.len = 0
if(length(GLOB.mentors))
Lines += "<b>Mentors:</b>"
@@ -46,10 +46,10 @@
var/client/C = X
if(C && (!C.holder || (C.holder && !C.holder.fakekey))) //>using stuff this complex instead of just using if/else lmao
assembled += "\t <font color='#0033CC'>[C.key]</font>[admin_mode? "[show_admin_info(C)]":""] ([round(C.avgping, 1)]ms)"
Lines += sortList(assembled)
Lines += sort_list(assembled)
assembled.len = 0
Lines += "<b>Players:</b>"
for(var/X in sortList(GLOB.clients))
for(var/X in sort_list(GLOB.clients))
var/client/C = X
if(!C)
continue
@@ -57,8 +57,8 @@
if(C.holder && C.holder.fakekey)
key = C.holder.fakekey
assembled += "\t [key][admin_mode? "[show_admin_info(C)]":""] ([round(C.avgping, 1)]ms)"
Lines += sortList(assembled)
Lines += sort_list(assembled)
for(var/line in Lines)
msg += "[line]\n"
modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm
+5 -5
View File
@@ -702,7 +702,7 @@ GLOBAL_LIST_EMPTY(rain_sounds)
else
new /obj/item/stack/sheet/hay/(get_turf(src))
qdel(src)
return 1
return TRUE
else
. = ..()
@@ -1081,9 +1081,9 @@ GLOBAL_LIST_INIT(hay_recipes, list ( \
attack_verb = list("tickled", "poked", "whipped")
hitsound = 'sound/weapons/grenadelaunch.ogg'
/obj/item/stack/sheet/hay/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.hay_recipes
return ..()
/obj/item/stack/sheet/hay/get_main_recipes()
. = ..()
. += GLOB.hay_recipes
/obj/item/stack/sheet/hay/fifty
amount = 50
@@ -1098,7 +1098,7 @@ GLOBAL_LIST_INIT(hay_recipes, list ( \
amount = 5
/obj/item/stack/sheet/hay/update_icon()
/obj/item/stack/sheet/hay/update_icon_state()
var/amount = get_amount()
if((amount <= 4) && (amount > 0))
icon_state = "hay[amount]"
modular_citadel/code/modules/festive/turfs.dm
+24 -24
View File
@@ -1503,9 +1503,9 @@
/obj/structure/festive/trainplatform/edge_north/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return 1
return TRUE
if(dir == FULLTILE_WINDOW_DIR)
return 0
return FALSE
if(get_dir(loc, target) == dir)
return !density
if(istype(mover, /obj/structure/festive/trainplatform/edge_north))
@@ -1518,14 +1518,14 @@
return FALSE
else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
return FALSE
return 1
return TRUE
/obj/structure/festive/trainplatform/edge_north/CheckExit(atom/movable/O, turf/target)
if(istype(O) && (O.pass_flags & PASSGLASS))
return 1
return TRUE
if(get_dir(O.loc, target) == dir)
return 0
return 1
return FALSE
return TRUE
/obj/structure/festive/trainplatform/edge_north
dir = SOUTH
@@ -1561,9 +1561,9 @@
/obj/structure/festive/trainplatform/edge_south/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return 1
return TRUE
if(dir == FULLTILE_WINDOW_DIR)
return 0
return FALSE
if(get_dir(loc, target) == dir)
return !density
if(istype(mover, /obj/structure/festive/trainplatform/edge_south))
@@ -1576,14 +1576,14 @@
return FALSE
else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
return FALSE
return 1
return TRUE
/obj/structure/festive/trainplatform/edge_north/CheckExit(atom/movable/O, turf/target)
if(istype(O) && (O.pass_flags & PASSGLASS))
return 1
return TRUE
if(get_dir(O.loc, target) == dir)
return 0
return 1
return FALSE
return TRUE
/obj/structure/festive/trainplatform/edge_south
dir = NORTH
@@ -1619,9 +1619,9 @@
/obj/structure/festive/trainplatform/edge_east/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return 1
return TRUE
if(dir == FULLTILE_WINDOW_DIR)
return 0
return FALSE
if(get_dir(loc, target) == dir)
return !density
if(istype(mover, /obj/structure/festive/trainplatform/edge_east))
@@ -1634,14 +1634,14 @@
return FALSE
else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
return FALSE
return 1
return TRUE
/obj/structure/festive/trainplatform/edge_east/CheckExit(atom/movable/O, turf/target)
if(istype(O) && (O.pass_flags & PASSGLASS))
return 1
return TRUE
if(get_dir(O.loc, target) == dir)
return 0
return 1
return FALSE
return TRUE
/obj/structure/festive/trainplatform/edge_east
dir = WEST
@@ -1677,9 +1677,9 @@
/obj/structure/festive/trainplatform/edge_west/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSGLASS))
return 1
return TRUE
if(dir == FULLTILE_WINDOW_DIR)
return 0
return FALSE
if(get_dir(loc, target) == dir)
return !density
if(istype(mover, /obj/structure/festive/trainplatform/edge_west))
@@ -1692,14 +1692,14 @@
return FALSE
else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
return FALSE
return 1
return TRUE
/obj/structure/festive/trainplatform/edge_west/CheckExit(atom/movable/O, turf/target)
if(istype(O) && (O.pass_flags & PASSGLASS))
return 1
return TRUE
if(get_dir(O.loc, target) == dir)
return 0
return 1
return FALSE
return TRUE
/obj/structure/festive/trainplatform/edge_west
dir = EAST
modular_citadel/code/modules/mentor/mentorpm.dm
+1 -1
View File
@@ -9,7 +9,7 @@
for(var/client/T)
targets["[T]"] = T
var/list/sorted = sortList(targets)
var/list/sorted = sort_list(targets)
var/target = input(src,"To whom shall we send a message?","Mentor PM",null) in sorted|null
cmd_mentor_pm(targets[target],null)
SSblackbox.record_feedback("tally", "Mentor_verb", 1, "APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+1 -1
View File
@@ -68,7 +68,7 @@
playsound(M, 'sound/weapons/laserPump.ogg', 100, 1) //Ends with high pitched charging noise
recharge_newshot() //try to charge a new shot
update_icon()
return 1
return TRUE
/obj/item/gun/energy/pumpaction/AltClick(mob/living/user) //for changing firing modes since attackself is already used for pumping
. = ..()
modular_citadel/code/modules/vectorcrafts/vectorcraft.dm
+2 -2
View File
@@ -133,10 +133,10 @@
check_boost()
if(driver.m_intent == MOVE_INTENT_WALK)
var/deceleration = max_deceleration
if(driver.in_throw_mode)
if(driver.throw_mode)
deceleration *= 1.5
friction(deceleration, TRUE)
else if(driver.in_throw_mode)
else if(driver.throw_mode)
friction(max_deceleration*1.2, TRUE)
friction(max_deceleration/4)