Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cyborg refactor: icons, chassis, modules base #6929

Draft
wants to merge 41 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
85ed5e7
start
silicons Dec 10, 2024
e3dae70
rename
silicons Dec 10, 2024
bb651b6
mov
silicons Dec 10, 2024
f7a612e
stubs
silicons Dec 10, 2024
85e2b44
that
silicons Dec 13, 2024
15c5f98
Merge branch 'borg-1' of https://github.com/silicons/Citadel-Station-…
silicons Dec 13, 2024
ab49cd0
robot stuff
silicons Dec 13, 2024
fa6ac90
dme
silicons Dec 13, 2024
1fd0ab0
expands ai lawset to multiple files
silicons Dec 13, 2024
8ce7dcf
variation system
silicons Dec 14, 2024
9c0913e
ok
silicons Dec 14, 2024
4932a55
insatnity
silicons Dec 15, 2024
acbc204
merge in rest
silicons Dec 15, 2024
4b770db
merge
silicons Dec 15, 2024
0fda764
merged
silicons Dec 15, 2024
f6286b9
stubs
silicons Dec 15, 2024
6c4b630
replace
silicons Dec 16, 2024
40f2f9d
repath
silicons Dec 17, 2024
276495d
sigh
silicons Dec 17, 2024
ee2ed1c
that
silicons Dec 17, 2024
8ec9d3a
baselines
silicons Dec 18, 2024
ae1d192
panel sprites
silicons Dec 18, 2024
18238a9
updates
silicons Dec 18, 2024
326bab2
updates
silicons Dec 18, 2024
31ebceb
new system
silicons Dec 18, 2024
6756def
item mounts are needed
silicons Dec 19, 2024
24bc86e
item mount
silicons Dec 19, 2024
aa4950a
rewrites
silicons Dec 19, 2024
5aba944
hell
silicons Dec 19, 2024
5cacdf4
oops
silicons Dec 19, 2024
842bd18
pruning
silicons Dec 19, 2024
3f14a47
Merge remote-tracking branch 'upstream/master' into borg-1
silicons Dec 19, 2024
541e072
yikes
silicons Dec 19, 2024
cf27012
Merge remote-tracking branch 'upstream/master' into borg-1
silicons Dec 20, 2024
9d41dea
reorganize
silicons Dec 20, 2024
158d4c7
reorganize
silicons Dec 20, 2024
09b0195
stuff
silicons Dec 20, 2024
7fdd5f3
stack adapter
silicons Dec 20, 2024
aef110d
udpate
silicons Dec 20, 2024
29b3f93
updates
silicons Dec 20, 2024
6a0fa7e
updates
silicons Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 132 additions & 43 deletions citadel.dme

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions code/__DEFINES/qdel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@
#define GC_QUEUED_FOR_QUEUING -1
#define GC_CURRENTLY_BEING_QDELETED -2

/// qdel() has been called, at some point, on us, and it did not return LETMELIVE
#define QDELING(X) (X.gc_destroyed)
/// we are either
/// * deleted / nulled already
/// * qdel() has been called, at some point, on us, and it did not return LETMELIVE
#define QDELETED(X) (!X || QDELING(X))
/// we are currently in Destroy() logic
#define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)

//* Qdel helper macros. *//
Expand Down
6 changes: 6 additions & 0 deletions code/controllers/repository/robot_chassis.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2024 Citadel Station Developers *//

REPOSITORY_DEF(robot_chassis)
name = "Repository - Robot Chassis"
expected_type = /datum/prototype/robot_chassis
6 changes: 6 additions & 0 deletions code/controllers/repository/robot_frames.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2024 Citadel Station Developers *//

REPOSITORY_DEF(robot_frames)
name = "Repository - Robot Frames"
expected_type = /datum/robot_frame
6 changes: 6 additions & 0 deletions code/controllers/repository/robot_iconset.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2024 Citadel Station Developers *//

REPOSITORY_DEF(robot_iconsets)
name = "Repository - Robot Iconsets"
expected_type = /datum/prototype/robot_iconset
6 changes: 6 additions & 0 deletions code/controllers/repository/robot_modules.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2024 Citadel Station Developers *//

REPOSITORY_DEF(robot_modules)
name = "Repository - Robot Modules"
expected_type = /datum/prototype/robot_module
293 changes: 0 additions & 293 deletions code/datums/ai_law_sets.dm

This file was deleted.

4 changes: 2 additions & 2 deletions code/datums/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

for(var/mob/living/silicon/robot/robot in GLOB.mob_list)
// No combat/syndicate cyborgs, no drones, and no AI shells.
if(!robot.scrambledcodes && !robot.shell && !(robot.module && robot.module.hide_on_manifest))
if(!robot.scrambledcodes && !robot.shell && robot.module_new?.legacy_show_on_manifest)
bot[robot.name] = "[robot.modtype] [robot.braintype]"


Expand Down Expand Up @@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(PDA_Manifest)

for(var/mob/living/silicon/robot/robot in GLOB.mob_list)
// No combat/syndicate cyborgs, no drones, and no AI shells.
if(robot.scrambledcodes || robot.shell || (robot.module && robot.module.hide_on_manifest))
if(robot.scrambledcodes || robot.shell || !robot.module_new?.legacy_show_on_manifest)
continue

bot[++bot.len] = list("name" = robot.real_name, "rank" = "[robot.modtype] [robot.braintype]", "active" = "Active")
Expand Down
2 changes: 1 addition & 1 deletion code/datums/world_topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@

for(var/mob/living/silicon/robot/robot in GLOB.mob_list)
// No combat/syndicate cyborgs, no drones, and no AI shells.
if(!robot.scrambledcodes && !robot.shell && !(robot.module && robot.module.hide_on_manifest))
if(!robot.scrambledcodes && !robot.shell && robot.module_new?.legacy_show_on_manifest)
silicons[robot.name] = "[robot.modtype] [robot.braintype]"

. = list()
Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/station/rogue_ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var/datum/antagonist/rogue_ai/malf
return

A.setup_for_malf()
A.laws = new /datum/ai_laws/nanotrasen/malfunction
A.laws = new /datum/ai_lawset/nanotrasen/malfunction


var/mob/living/silicon/ai/malf = player.current
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/ai_core.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon = 'icons/mob/AI.dmi'
icon_state = "0"
var/state = 0
var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen
var/datum/ai_lawset/laws = new /datum/ai_lawset/nanotrasen
var/obj/item/circuitboard/circuit = null
var/obj/item/mmi/brain = null

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/floorlayer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
T = tile
tile.forceMove(src)
else
tile.merge(T)
tile.merge_into_other(T)

/obj/machinery/floorlayer/proc/CollectTiles(turf/w_turf)
for(var/obj/item/stack/tile/tile in w_turf)
Expand Down
File renamed without changes.
Loading
Loading