cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-09-13 15:05:53 +02:00
parent 454bcc02d6 a4f6d03944
commit 4b051c23fc
969 changed files with 169510 additions and 210533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+6 -6
View File
@@ -1082,18 +1082,18 @@ var/datum/announcement/minor/admin_min_announcer = new
return 0
/datum/admins/proc/spawn_fruit(seedtype in plant_controller.seeds)
/datum/admins/proc/spawn_fruit(seedtype in SSplants.seeds)
set category = "Debug"
set desc = "Spawn the product of a seed."
set name = "Spawn Fruit"
if(!check_rights(R_SPAWN)) return
if(!seedtype || !plant_controller.seeds[seedtype])
if(!seedtype || !SSplants.seeds[seedtype])
return
var/amount = input("Amount of fruit to spawn", "Fruit Amount", 1) as null|num
if(!isnull(amount))
var/datum/seed/S = plant_controller.seeds[seedtype]
var/datum/seed/S = SSplants.seeds[seedtype]
S.harvest(usr,0,0,amount)
log_admin("[key_name(usr)] spawned [seedtype] fruit at ([usr.x],[usr.y],[usr.z])")
@@ -1137,16 +1137,16 @@ var/datum/announcement/minor/admin_min_announcer = new
for(var/datum/custom_item/item in current_items)
to_chat(usr, "- name: [item.name] icon: [item.item_icon] path: [item.item_path] desc: [item.item_desc]")
/datum/admins/proc/spawn_plant(seedtype in plant_controller.seeds)
/datum/admins/proc/spawn_plant(seedtype in SSplants.seeds)
set category = "Debug"
set desc = "Spawn a spreading plant effect."
set name = "Spawn Plant"
if(!check_rights(R_SPAWN)) return
if(!seedtype || !plant_controller.seeds[seedtype])
if(!seedtype || !SSplants.seeds[seedtype])
return
new /obj/effect/plant(get_turf(usr), plant_controller.seeds[seedtype])
new /obj/effect/plant(get_turf(usr), SSplants.seeds[seedtype])
log_admin("[key_name(usr)] spawned [seedtype] vines at ([usr.x],[usr.y],[usr.z])")
/datum/admins/proc/spawn_atom(var/object as text)
code/modules/admin/admin_verbs.dm
+2 -2
View File
@@ -421,8 +421,8 @@
var/mob/living/silicon/S = input("Select silicon.", "Manage Silicon Laws") as null|anything in silicon_mob_list
if(!S) return
var/datum/nano_module/law_manager/L = new(S)
L.ui_interact(usr, state = admin_state)
var/datum/tgui_module/law_manager/admin/L = new(S)
L.tgui_interact(usr)
log_and_message_admins("has opened [S]'s law manager.")
feedback_add_details("admin_verb","MSL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/newbanjob.dm
+1 -1
View File
@@ -63,7 +63,7 @@ var/savefile/Banlistjob
bantimestamp = CMinutes + minutes
if(rank == "Heads")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Colony Director")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Site Manager")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
code/modules/admin/verbs/debug.dm
+1 -1
View File
@@ -288,7 +288,7 @@
id.icon_state = "gold"
id.access = get_all_accesses().Copy()
id.registered_name = H.real_name
id.assignment = "Colony Director"
id.assignment = "Site Manager"
id.name = "[id.registered_name]'s ID Card ([id.assignment])"
H.equip_to_slot_or_del(id, slot_wear_id)
H.update_inv_wear_id()
code/modules/admin/verbs/debug_vr.dm
+23 -3
View File
@@ -2,6 +2,8 @@
set category = "Fun"
set name = "Quick NIF"
set desc = "Spawns a NIF into someone in quick-implant mode."
var/input_NIF
if(!check_rights(R_ADMIN))
return
@@ -24,9 +26,27 @@
return
if(H.species.flags & NO_SCAN)
var/obj/item/device/nif/S = /obj/item/device/nif/bioadap
input_NIF = initial(S.name)
new /obj/item/device/nif/bioadap(H)
else
new /obj/item/device/nif(H)
var/list/NIF_types = typesof(/obj/item/device/nif)
var/list/NIFs = list()
for(var/NIF_type in NIF_types)
var/obj/item/device/nif/S = NIF_type
NIFs[capitalize(initial(S.name))] = NIF_type
var/list/show_NIFs = sortList(NIFs) // the list that will be shown to the user to pick from
input_NIF = input("Pick the NIF type","Quick NIF") in show_NIFs
var/chosen_NIF = NIFs[capitalize(input_NIF)]
if(chosen_NIF)
new chosen_NIF(H)
else
new /obj/item/device/nif(H)
log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name] with a [input_NIF].")
feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name].")
feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!