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

NTIS #2523

Merged
merged 49 commits into from Apr 16, 2024
Merged

NTIS #2523

Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
06e5d2a
Nice Backup
RashCat Feb 20, 2024
da19445
It's working! Well done!
RashCat Feb 21, 2024
be60a55
WorksAndLadno
RashCat Feb 28, 2024
0677f17
WorkLikeABoss
RashCat Feb 28, 2024
3ca48e7
It's WORKING
RashCat Feb 28, 2024
a60cdaa
Кулдовен
RashCat Mar 3, 2024
60a023d
ContinueCoding
RashCat Mar 5, 2024
7d769ef
Pum-purururm
RashCat Mar 5, 2024
2f63aae
Something
RashCat Mar 6, 2024
5b8b081
SomeChanges
RashCat Mar 10, 2024
5bbadec
Осталось чуть-чуть
RashCat Mar 11, 2024
aaddb41
ZERODOWNZERODOWN
RashCat Mar 11, 2024
ee2a37d
WoopWoop
RashCat Mar 13, 2024
0cb5b7c
AlmostDone
RashCat Mar 14, 2024
a7cb199
+sound
RashCat Mar 15, 2024
0833cb9
fin
RashCat Mar 15, 2024
dc41078
well
RashCat Mar 15, 2024
6f48236
Merge branch 'NTpolice' of https://github.com/RaShCat/FF-STG into NTp…
RashCat Mar 15, 2024
393264b
It's over, enakhin
RashCat Mar 15, 2024
e105ba5
Well, End.
RashCat Mar 18, 2024
b5a8384
Small for better
RashCat Mar 23, 2024
37e98d8
Done
RashCat Mar 23, 2024
5419de6
Merge branch 'Fluffy-Frontier:master' into NTpolice
Mar 23, 2024
04b02a1
Testiruem
RashCat Mar 23, 2024
0e3ee42
Rename NT_police.dm to nt_police.dm
Mar 23, 2024
f0628bd
Rename NT_police_loadaut.dm to nt_police_loadaut.dm
Mar 23, 2024
2d382f2
v
RashCat Mar 23, 2024
067cab7
Modsuit for trooper and minor changes
RashCat Mar 25, 2024
31b9a00
+cooler headset for NTR
RashCat Mar 25, 2024
f198264
Well...
RashCat Mar 25, 2024
e08ef8a
Коопкомпашка
RashCat Mar 25, 2024
508b1fd
Merge branch 'Fluffy-Frontier:master' into NTpolice
Mar 25, 2024
51977ef
+icons
RashCat Mar 25, 2024
e6c3122
The last. Actually.
RashCat Mar 25, 2024
832e110
Я кстати не знаю почему тут был вложенный if
RashCat Mar 26, 2024
28641e7
Merge branch 'Fluffy-Frontier:master' into NTpolice
Mar 26, 2024
27b0cc1
Merge branch 'NTpolice' of https://github.com/RaShCat/FF-STG into NTp…
RashCat Mar 26, 2024
dda1bc1
Merge branch 'Fluffy-Frontier:master' into NTpolice
Mar 26, 2024
f4fc323
Ящур, держи :Р
RashCat Mar 26, 2024
da130fc
Merge branch 'Fluffy-Frontier:master' into NTpolice
Mar 26, 2024
c2b05b9
missing stuff :c
RashCat Mar 26, 2024
ddbe345
Merge branch 'Fluffy-Frontier:master' into NTpolice
Mar 27, 2024
845e225
TESHARIA. F*CK YEAH!
RashCat Apr 1, 2024
96d34c3
Merge branch 'Fluffy-Frontier:master' into NTpolice
Apr 1, 2024
d1f1058
Merge branch 'NTpolice' of https://github.com/RaShCat/FF-STG into NTp…
RashCat Apr 1, 2024
fd47b90
Update nt_police_items.dm
RashCat Apr 1, 2024
948fa37
Кажется хорошо работает
RashCat Apr 2, 2024
e92cbac
Merge branch 'Fluffy-Frontier:master' into NTpolice
Apr 2, 2024
aa032fd
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Apr 3, 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
41 changes: 41 additions & 0 deletions tff_modular/modules/modular_automapper/replacer.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/datum/controller/subsystem/area_spawn/Initialize()
for(var/iterating_type in subtypesof(/datum/area_replace_obj))
var/datum/area_replace_obj/iterating_area_replace_obj = new iterating_type
iterating_area_replace_obj.try_spawn()
qdel(iterating_area_replace_obj)
. = ..()
/**
* Spawns an atom ensted of atom or object.
*/
/datum/area_replace_obj
/// Where?
var/list/target_areas
/// What we spawning?
var/desired_obj
/// What we removing?
var/target_obj
/// Map blacklist, this is used to determine what maps we should not spawn on.
var/list/blacklisted_stations = list("Runtime Station", "MultiZ Debug", "Gateway Test")

/**
* Replace the atom.
*/
/datum/area_replace_obj/proc/try_spawn()
// Ищем область где будем искать объект под замену.
if(SSmapping.config.map_name in blacklisted_stations)
return

for(var/area_type in target_areas)
var/area/found_area = GLOB.areas_by_type[area_type]
if(!found_area)
continue
// Каждую клетку прогоняем.
for(var/list/zlevel_turfs as anything in found_area.get_zlevel_turf_lists())
for(var/turf/candidate_turf as anything in zlevel_turfs)
if(is_type_on_turf(candidate_turf, target_obj))
//Нашли клетку где стоит наш объект под замену, копируем направление старого.
var/obj/old_obj = pick(candidate_turf.get_all_contents_type(target_obj))
var/obj/new_obj= new desired_obj(candidate_turf)
new_obj.setDir(old_obj.dir)
qdel(old_obj)
break
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/area_replace_obj/comntr_console
target_areas = list(/area/station/command/heads_quarters/nt_rep)
desired_obj = /obj/machinery/computer/comntr
target_obj = /obj/machinery/modular_computer/preset/command
2 changes: 2 additions & 0 deletions tff_modular/modules/nanotrasen_consultant/code.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/item/radio/headset/heads/nanotrasen_consultant
keyslot = new /obj/item/encryptionkey/heads/captain
Loading
Loading