cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-31 00:49:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
This commit is contained in:
Kelshark
2017-09-23 11:40:55 -04:00
parent bd95659677 fc1f983297
commit 457ff1356a
195 changed files with 12835 additions and 26536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+3 -1
View File
@@ -69,8 +69,9 @@ var/list/admin_verbs_admin = list(
/datum/admins/proc/toggledsay, //toggles dsay on/off for everyone,
/client/proc/game_panel, //game panel, allows to change game-mode etc,
/client/proc/cmd_admin_say, //admin-only ooc chat,
/datum/admins/proc/PlayerNotes,
/client/proc/cmd_mod_say,
/client/proc/cmd_event_say,
/datum/admins/proc/PlayerNotes,
/datum/admins/proc/show_player_info,
/client/proc/free_slot, //frees slot for chosen job,
/client/proc/cmd_admin_change_custom_event,
@@ -313,6 +314,7 @@ var/list/admin_verbs_mod = list(
/datum/admins/proc/PlayerNotes,
/client/proc/admin_ghost, //allows us to ghost/reenter body at will,
/client/proc/cmd_mod_say,
/client/proc/cmd_event_say,
/datum/admins/proc/show_player_info,
/client/proc/player_panel_new,
/client/proc/dsay,
code/modules/admin/verbs/adminsay.dm
+28 -3
View File
@@ -2,10 +2,12 @@
set category = "Special Verbs"
set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
set hidden = 1
if(!check_rights(R_ADMIN)) return
if(!check_rights(R_ADMIN))
return
msg = sanitize(msg)
if(!msg) return
if(!msg)
return
log_admin("ADMIN: [key_name(src)] : [msg]")
@@ -21,7 +23,8 @@
set name = "Msay"
set hidden = 1
if(!check_rights(R_ADMIN|R_MOD|R_MENTOR|R_SERVER)) return
if(!check_rights(R_ADMIN|R_MOD|R_MENTOR|R_SERVER))
return
msg = sanitize(msg)
log_admin("MOD: [key_name(src)] : [msg]")
@@ -36,3 +39,25 @@
C << "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_event_say(msg as text)
set category = "Special Verbs"
set name = "Esay"
set hidden = 1
if(!check_rights(R_ADMIN|R_MOD|R_MENTOR|R_SERVER))
return
msg = sanitize(msg)
log_admin("EVENT: [key_name(src)] : [msg]")
if (!msg)
return
var/sender_name = key_name(usr, 1)
if(check_rights(R_ADMIN, 0))
sender_name = "<span class='admin'>[sender_name]</span>"
for(var/client/C in admins)
C << "<span class='event_channel'>" + create_text_tag("event", "EVENT:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/debug.dm
+12 -12
View File
@@ -418,8 +418,8 @@
"nanotrasen representative",
"nanotrasen officer",
"nanotrasen captain",
"UNSC marine",
"UNSC officer",
"USDF marine",
"USDF officer",
"SolGov Representative",
"Imperial soldier",
"Imperial officer"
@@ -788,28 +788,28 @@
W.assignment = "Admiral"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("UNSC marine")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/unsc(M), slot_head)
if("USDF marine")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/USDF(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/utility/marine/green(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/unsc(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/USDF(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/battlerifle(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/tactical(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_l_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_l_hand)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s military ID Card"
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "UNSC"
W.assignment = "USDF"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("UNSC officer")
if("USDF officer")
M.equip_to_slot_or_del(new /obj/item/clothing/head/dress/marine/command/admiral(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(M), slot_l_ear)
@@ -825,7 +825,7 @@
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "UNSC"
W.assignment = "USDF"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("SolGov Representative")