diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index d574d6d2b7b..8c57bb0c45b 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -8,8 +8,8 @@ var/dat = "
" dat += "Debug" - dat += "Random Events" - dat += "Special Events" + dat += "IC Events" + dat += "OOC Events" dat += "
" dat += "
" @@ -31,7 +31,6 @@ List Fingerprints

Break all lights
Fix all lights
- The floor is lava! (DANGEROUS: extremely lame)
Make all areas powered
Make all areas unpowered
Power all SMES
@@ -39,6 +38,11 @@ Send Prison Shuttle
Return Prison Shuttle

+ Launch a shuttle
+ Force launch a shuttle
+ Jump a shuttle
+ Move a shuttle
+
"} if(check_rights(R_SERVER,0)) @@ -59,51 +63,30 @@ Admin Log

"} + if (1) if(check_rights((R_EVENT|R_SERVER),0)) dat += {" - 'Random' Events
+ IC Events

- Spawn a wave of meteors (aka lagocolyptic shower)
- Spawn a vortex anomaly
- Spawn a gravitational anomaly
- Spawn a pyroclastic anomaly
- Spawn a flux wave anomaly
- Spawn a bluespace anomaly
- Make scrubbers spew chemicals
- Spawn wormholes
- Spawn blob
- Trigger a Xenomorph infestation
- Trigger a Cortical Borer infestation
- Spawn an Alien silently
- Trigger a Spider infestation
Send in a strike team
Send in a syndicate strike team
Send in a HONKsquad
- Trigger an Carp migration
- Irradiate the station
- Trigger a Prison Break
- Trigger a Virus Outbreak
- Spawn an Immovable Rod
- Toggle a "lights out" event
- Spawn an Ion Storm
- Spawn Space-Vines
- Trigger a communication blackout

- Launch a shuttle
- Force launch a shuttle
- Jump a shuttle
- Move a shuttle
+ Change Security Level To Green
+ Change Security Level To Blue
+ Change Security Level To Red
+ Change Security Level To Gamma
+ Change Security Level To Epsilon
+ Change Security Level To Delta

"} - - - if (2) if(check_rights((R_SERVER|R_EVENT),0)) dat += {" - Fun Secrets
+ OOC Events

+ The floor is lava! (DANGEROUS: extremely lame)
Start a Thunderdome match
Reset Thunderdome to default state
Remove 'internal' clothing
@@ -123,14 +106,11 @@ Summon Guns
Summon Magic

- Change Security Level To Green
- Change Security Level To Blue
- Change Security Level To Red
- Change Security Level To Gamma
- Change Security Level To Epsilon
- Change Security Level To Delta
- "} + Roll the Dice
+
"} dat += "" var/datum/browser/popup = new(usr, "secrets", "
Admin Secrets
", 610, 650) popup.set_content(dat) popup.open(0) + + diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3f912fdf23b..c34147845cb 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2139,48 +2139,7 @@ log_admin("[key_name(usr)] toggled gravity off.", 1) message_admins("\blue [key_name_admin(usr)] toggled gravity off.", 1) command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.") - if("wave") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","Meteor") - log_admin("[key_name(usr)] spawned a meteor wave", 1) - message_admins("\blue [key_name_admin(usr)] spawned a meteor wave.", 1) - new /datum/event/meteor_wave - if("gravanomalies") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","GA") - message_admins("[key_name_admin(usr)] has spawned a gravitational anomaly") - new /datum/event/anomaly/anomaly_grav() - if("pyroanomalies") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","PYRO") - message_admins("[key_name_admin(usr)] has spawned a pyroclastic anomaly") - new /datum/event/anomaly/anomaly_pyro() - if("blackhole") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","BH") - message_admins("[key_name_admin(usr)] has spawned a vortex anomaly") - new /datum/event/anomaly/anomaly_vortex() - if("bluespaceanomaly") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","BA") - message_admins("[key_name_admin(usr)] has triggered a bluespace anomaly", 1) - new /datum/event/anomaly/anomaly_bluespace() - if("energeticflux") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","FLUX") - message_admins("[key_name_admin(usr)] has triggered an energetic flux") - new /datum/event/anomaly/anomaly_flux() - if("goblob") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","BLOB") - message_admins("[key_name_admin(usr)] has triggered a blob.") - new /datum/game_mode/blob() - if("aliens") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","ALIEN") - message_admins("[key_name_admin(usr)] has triggered an alien infestation.") - new /datum/event/alien_infestation() if("power") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","P") @@ -2497,21 +2456,6 @@ spawn(0) sleep(rand(30,400)) Wall.ex_act(rand(2,1)) */ - if("immovable") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","IR") - message_admins("[key_name_admin(usr)] has sent an immovable rod to the station", 1) - immovablerod() - if("prison_break") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","PB") - message_admins("[key_name_admin(usr)] has allowed a prison break", 1) - new /datum/event/prison_break - if("radiation") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","RAD") - message_admins("[key_name_admin(usr)] has started a radiation event", 1) - new /datum/event/radiation_storm if("lightout") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","LO") @@ -2583,16 +2527,6 @@ F.update_icon() floorIsLava = 0 return - if("virus") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","V") - var/answer = alert("Do you want this to be a greater disease or a lesser one?",,"Greater","Lesser") - if(answer=="Lesser") - virus2_lesser_infection() - message_admins("[key_name_admin(usr)] has triggered a lesser virus outbreak.", 1) - else - virus2_greater_infection() - message_admins("[key_name_admin(usr)] has triggered a greater virus outbreak.", 1) if("retardify") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","RET") @@ -2627,47 +2561,6 @@ W.req_access = list() message_admins("[key_name_admin(usr)] activated Egalitarian Station mode") command_announcement.Announce("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.", new_sound = 'sound/AI/commandreport.ogg') - if("dorf") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","DF") - for(var/mob/living/carbon/human/B in mob_list) - B.f_style = "Dward Beard" - B.update_hair() - message_admins("[key_name_admin(usr)] activated dorf mode") - if("ionstorm") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","I") - new /datum/event/ionstorm - message_admins("[key_name_admin(usr)] triggered an ion storm") - var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No") - if(show_log == "Yes") - command_announcement.Announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", new_sound = 'sound/AI/ionstorm.ogg') - if("carp") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","Crp") - new /datum/event/carp_migration - message_admins("[key_name_admin(usr)] triggered a carp migration") - if("spiders") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","Sp") - new /datum/event/spider_infestation - message_admins("[key_name_admin(usr)] has spawned giant spiders", 1) - if("borers") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","Borers") - log_admin("[key_name(usr)] spawned a cortical borer infestation.", 1) - message_admins("\blue [key_name_admin(usr)] spawned a cortical borer infestation.", 1) - new /datum/event/borer_infestation - if("spacevines") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","K") - new /datum/event/spacevine - message_admins("[key_name_admin(usr)] has spawned spacevines", 1) - if("vent_clog") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","VC") - new /datum/event/vent_clog - message_admins("[key_name_admin(usr)] has made scrubbers spew chemical smoke", 1) if("onlyone") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","OO") @@ -2678,6 +2571,10 @@ feedback_add_details("admin_secrets_fun_used","OOT") usr.client.only_one_team() // message_admins("[key_name_admin(usr)] has triggered ") + if("rolldice") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","ROL") + usr.client.roll_dices() if("guns") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","SG") diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm new file mode 100644 index 00000000000..62b46fba8ee --- /dev/null +++ b/code/modules/admin/verbs/dice.dm @@ -0,0 +1,22 @@ +/client/proc/roll_dices() + if(!check_rights(R_EVENT)) + return + + var/sum = input("How many times should we throw?") as num + var/side = input("Select the number of sides.") as num + if(!side) + side = 6 + if(!sum) + sum = 2 + + var/dice = num2text(sum) + "d" + num2text(side) + + if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes") + world << "

The dice have been rolled by Gods!

" + + var/result = roll(dice) + + if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes") + world << "

Gods rolled [dice], result is [result]

" + + message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1) \ No newline at end of file diff --git a/paradise.dme b/paradise.dme index c5628c027ab..28d431a7730 100644 --- a/paradise.dme +++ b/paradise.dme @@ -899,6 +899,7 @@ #include "code\modules\admin\verbs\deadsay.dm" #include "code\modules\admin\verbs\debug.dm" #include "code\modules\admin\verbs\diagnostics.dm" +#include "code\modules\admin\verbs\dice.dm" #include "code\modules\admin\verbs\freeze.dm" #include "code\modules\admin\verbs\getlogs.dm" #include "code\modules\admin\verbs\honksquad.dm"