cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Monkey mode now wont list name->key after the end of round.

Browse Source 
Monkeys during monkey mode can use detective's revolver wearing hat and suit (without uniform).
Fixed some runtime errors.
Added ability for admins to disallow connecting for guests.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1395 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-04-06 17:01:58 +00:00
parent 35189c3863
commit 03e677a807
9 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/global.dm
View File

@@ -69,6 +69,7 @@ var
dna_ident = 1
abandon_allowed = 1
enter_allowed = 1
guests_allowed = 1
shuttle_frozen = 0
shuttle_left = 0
tinted_weldhelh = 1 //as soon as the thing is sprited, we'll code in the toggle verb, bot for now, it should stay on by default. -errorage //Until you have the actual functionality for it, don't set this on by default. You're putting the cart before the horse. --DH

3
code/game/machinery/bots/ed209bot.dm
View File

@@ -667,8 +667,9 @@ Auto Patrol: []"},
return
return
/obj/machinery/bot/ed209/Bumped(M as mob|obj)
/obj/machinery/bot/ed209/Bumped(atom/movable/M as mob|obj)
spawn(0)
if (M)
var/turf/T = get_turf(src)
M:loc = T

4
code/game/machinery/bots/medbot.dm
View File

@@ -482,12 +482,12 @@
return
return
/obj/machinery/bot/medbot/Bumped(M as mob|obj)
/obj/machinery/bot/medbot/Bumped(atom/movable/M as mob|obj)
spawn(0)
if (M)
var/turf/T = get_turf(src)
M:loc = T
/*
* Pathfinding procs, allow the medibot to path through doors it has access to.
*/

3
code/game/machinery/bots/secbot.dm
View File

@@ -648,8 +648,9 @@ Auto Patrol: []"},
return
return
/obj/machinery/bot/secbot/Bumped(M as mob|obj)
/obj/machinery/bot/secbot/Bumped(atom/movable/M as mob|obj)
spawn(0)
if (M)
var/turf/T = get_turf(src)
M:loc = T

2
code/game/objects/items/weapons/guns_ammo.dm
View File

@@ -443,7 +443,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
/obj/item/weapon/gun/detectiverevolver/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
var/detective = (istype(user:w_uniform, /obj/item/clothing/under/det) && istype(user:head, /obj/item/clothing/head/det_hat) && istype(user:wear_suit, /obj/item/clothing/suit/det_suit))
var/detective = ((istype(user:w_uniform, /obj/item/clothing/under/det) || !istype(user, /mob/living/carbon/human)) && istype(user:head, /obj/item/clothing/head/det_hat) && istype(user:wear_suit, /obj/item/clothing/suit/det_suit))
if (flag)
return

13
code/modules/admin/admin.dm
View File

@@ -2241,6 +2241,19 @@ var/showadminmessages = 1
world << "<B>The tinted_weldhelh has been disabled!</B>"
log_admin("[key_name(usr)] toggled tinted_weldhelh.")
message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1)
/obj/admins/proc/toggleguests()
set category = "Server"
set desc="Guests can't enter"
set name="Toggle guests"
guests_allowed = !( guests_allowed )
if (!( guests_allowed ))
world << "<B>Guests may no longer enter the game.</B>"
else
world << "<B>Guests may now enter the game.</B>"
log_admin("[key_name(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.")
message_admins("\blue [key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1)
//
//
//ALL DONE

15
code/modules/admin/admin_verbs.dm
View File

@@ -37,6 +37,7 @@
src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -176,6 +177,7 @@
src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -306,6 +308,7 @@
src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -461,6 +464,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
//src.verbs += /obj/admins/proc/toggleooc //toggle ooc
//src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -606,6 +610,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
//src.verbs += /obj/admins/proc/toggleooc //toggle ooc
//src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -747,6 +752,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
//src.verbs += /obj/admins/proc/toggleooc //toggle ooc
//src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -871,6 +877,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1026,6 +1033,7 @@
src.verbs -= /obj/admins/proc/toggleaban //abandon mob
src.verbs -= /obj/admins/proc/toggleAI //Toggle the AI
src.verbs -= /obj/admins/proc/toggleenter //Toggle enterting
src.verbs -= /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs -= /obj/admins/proc/toggleooc //toggle ooc
src.verbs -= /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs -= /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1455,6 +1463,7 @@
src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1485,6 +1494,7 @@
src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1515,6 +1525,7 @@
src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1552,6 +1563,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
//src.verbs += /obj/admins/proc/toggleooc //toggle ooc
//src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1589,6 +1601,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
//src.verbs += /obj/admins/proc/toggleooc //toggle ooc
//src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1614,6 +1627,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
//src.verbs += /obj/admins/proc/toggleooc //toggle ooc
//src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling
@@ -1644,6 +1658,7 @@
//src.verbs += /obj/admins/proc/toggleaban //abandon mob
src.verbs += /obj/admins/proc/toggleAI //Toggle the AI
src.verbs += /obj/admins/proc/toggleenter //Toggle enterting
src.verbs += /obj/admins/proc/toggleguests //Toggle guests entering
src.verbs += /obj/admins/proc/toggleooc //toggle ooc
src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc
//src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling

5
code/modules/mob/mob.dm
View File

@@ -1866,6 +1866,11 @@
alert(src,"You have been banned.\nReason : [isbanned]","Ban","Ok")
del(src)
if (!guests_allowed && IsGuestKey(src.key))
log_access("Failed Login: [src] - Guests not allowed")
message_admins("\blue Failed Login: [src] - Guests not allowed")
alert(src,"You cannot play here.\nReason : Guests not allowed","Guests not allowed","Ok")
del(src)
if (((world.address == src.address || !(src.address)) && !(host)))
host = src.key

6
code/unused/gamemodes/monkey.dm
View File

@@ -62,8 +62,8 @@
else
world << "<FONT size = 3><B>The Research Staff has stopped the monkey invasion!</B></FONT>"
for(var/mob/living/carbon/human/human_player in world)
if (human_player.client)
world << "<B>[human_player.key] was [human_player.real_name].</B>"
for(var/mob/living/carbon/monkey/monkey_player in world)
if (monkey_player.client)
world << "<B>[monkey_player.key] was a monkey.</B>"
return 1