mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Merge branch 'master' of https://github.com/Baystation12/Baystation12
This commit is contained in:
Zuhayr
@@ -869,25 +869,27 @@ ________________________________________________________________________________
|
||||
if(s_active)
|
||||
cancel_stealth()
|
||||
else
|
||||
spawn(0)
|
||||
anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
|
||||
anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
|
||||
s_active=!s_active
|
||||
U.update_icons() //update their icons
|
||||
icon_state = U.gender==FEMALE ? "s-ninjasf" : "s-ninjas"
|
||||
U.regenerate_icons() //update their icons
|
||||
U << "\blue You are now invisible to normal detection."
|
||||
for(var/mob/O in oviewers(U))
|
||||
O.show_message("[U.name] vanishes into thin air!",1)
|
||||
U.invisibility = INVISIBILITY_OBSERVER
|
||||
return
|
||||
|
||||
/obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
|
||||
var/mob/living/carbon/human/U = affecting
|
||||
if(s_active)
|
||||
spawn(0)
|
||||
anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
|
||||
anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
|
||||
s_active=!s_active
|
||||
U.update_icons() //update their icons
|
||||
U << "\blue You are now visible."
|
||||
U.invisibility = 0
|
||||
for(var/mob/O in oviewers(U))
|
||||
O.show_message("[U.name] appears from thin air!",1)
|
||||
icon_state = U.gender==FEMALE ? "s-ninjanf" : "s-ninjan"
|
||||
U.regenerate_icons() //update their icons
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ var/global/datum/controller/occupations/job_master
|
||||
if(!job) continue
|
||||
var/list/candidates = FindOccupationCandidates(job, level)
|
||||
if(!candidates.len) continue
|
||||
|
||||
|
||||
// Build a weighted list, weight by age.
|
||||
var/list/weightedCandidates = list()
|
||||
|
||||
@@ -144,7 +144,7 @@ var/global/datum/controller/occupations/job_master
|
||||
if(command_position == "Captain")
|
||||
good_age_minimal = 30
|
||||
good_age_maximal = 70 // Old geezer captains ftw
|
||||
|
||||
|
||||
for(var/mob/V in candidates)
|
||||
// Log-out during round-start? What a bad boy, no head position for you!
|
||||
if(!V.client) continue
|
||||
@@ -164,9 +164,9 @@ var/global/datum/controller/occupations/job_master
|
||||
weightedCandidates[V] = 3 // Geezer.
|
||||
else
|
||||
// If there's ABSOLUTELY NOBODY ELSE
|
||||
if(candidates.len == 1) weightedCandidates[V] = 1
|
||||
|
||||
|
||||
if(candidates.len == 1) weightedCandidates[V] = 1
|
||||
|
||||
|
||||
var/mob/new_player/candidate = pickweight(weightedCandidates)
|
||||
if(AssignRole(candidate, command_position))
|
||||
return 1
|
||||
@@ -340,6 +340,7 @@ var/global/datum/controller/occupations/job_master
|
||||
//For ones returning to lobby
|
||||
for(var/mob/new_player/player in unassigned)
|
||||
if(player.client.prefs.alternate_option == RETURN_TO_LOBBY)
|
||||
player.ready = 0
|
||||
unassigned -= player
|
||||
return 1
|
||||
|
||||
|
||||
@@ -87,8 +87,8 @@
|
||||
for(var/datum/disease/D in patient.viruses)
|
||||
if(!D.hidden[SCANNER])
|
||||
foundVirus++
|
||||
//if(patient.virus2)
|
||||
// foundVirus++
|
||||
if(patient.virus2)
|
||||
foundVirus++
|
||||
|
||||
holder = patient.hud_list[HEALTH_HUD]
|
||||
if(patient.stat == 2)
|
||||
|
||||
@@ -186,7 +186,7 @@ var/global/floorIsLava = 0
|
||||
dat += "No notes found."
|
||||
else
|
||||
dat += "<table>"
|
||||
sortList(note_keys)
|
||||
note_keys = sortList(note_keys)
|
||||
|
||||
// Display the notes on the current page
|
||||
var/number_pages = note_keys.len / PLAYER_NOTES_ENTRIES_PER_PAGE
|
||||
@@ -210,7 +210,7 @@ var/global/floorIsLava = 0
|
||||
for(var/index = 1, index <= number_pages, index++)
|
||||
if(index == page)
|
||||
dat += "<b>"
|
||||
dat += "<a href='?src=\ref[src];notes=list;index='[index]'>[index]</a> "
|
||||
dat += "<a href='?src=\ref[src];notes=list;index=[index]'>[index]</a> "
|
||||
if(index == page)
|
||||
dat += "</b>"
|
||||
|
||||
|
||||
@@ -2466,4 +2466,6 @@
|
||||
switch(href_list["notes"])
|
||||
if("show")
|
||||
show_player_info(ckey)
|
||||
if("list")
|
||||
PlayerNotesPage(text2num(href_list["index"]))
|
||||
return
|
||||
|
||||
@@ -46,11 +46,15 @@
|
||||
if(!M.client) return
|
||||
var/client/C = M.client
|
||||
var/image/holder
|
||||
for(var/mob/living/carbon/human/patient in view(M))
|
||||
for(var/mob/living/carbon/human/patient in view(get_turf(M)))
|
||||
if(M.see_invisible < patient.invisibility)
|
||||
continue
|
||||
var/foundVirus = 0
|
||||
for(var/datum/disease/D in patient.viruses)
|
||||
if(!D.hidden[SCANNER])
|
||||
foundVirus++
|
||||
if(patient.virus2)
|
||||
foundVirus++
|
||||
if(!C) continue
|
||||
|
||||
holder = patient.hud_list[HEALTH_HUD]
|
||||
@@ -90,7 +94,9 @@
|
||||
if(!M.client) return
|
||||
var/client/C = M.client
|
||||
var/image/holder
|
||||
for(var/mob/living/carbon/human/perp in view(M))
|
||||
for(var/mob/living/carbon/human/perp in view(get_turf(M)))
|
||||
if(M.see_invisible < perp.invisibility)
|
||||
continue
|
||||
if(!C) continue
|
||||
var/perpname = perp.name
|
||||
holder = perp.hud_list[ID_HUD]
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
set name = "Toggle Magboots"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
if(usr.stat)
|
||||
return
|
||||
if(src.magpulse)
|
||||
src.flags &= ~NOSLIP
|
||||
src.slowdown = SHOES_SLOWDOWN
|
||||
|
||||
@@ -143,14 +143,11 @@ Please contact me on #coderbus IRC. ~Carn x
|
||||
overlays += I
|
||||
else
|
||||
var/stealth = 0
|
||||
if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja) && wear_suit:s_active)
|
||||
stealth = 1
|
||||
else
|
||||
//cloaking devices. //TODO: get rid of this :<
|
||||
for(var/obj/item/weapon/cloaking_device/S in list(l_hand,r_hand,belt,l_store,r_store))
|
||||
if(S.active)
|
||||
stealth = 1
|
||||
break
|
||||
//cloaking devices. //TODO: get rid of this :<
|
||||
for(var/obj/item/weapon/cloaking_device/S in list(l_hand,r_hand,belt,l_store,r_store))
|
||||
if(S.active)
|
||||
stealth = 1
|
||||
break
|
||||
if(stealth)
|
||||
icon = 'icons/mob/human.dmi'
|
||||
icon_state = "body_cloaked"
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
var/image/holder
|
||||
var/turf/T = get_turf_or_move(src.loc)
|
||||
for(var/mob/living/carbon/human/perp in view(T))
|
||||
if(src.see_invisible < perp.invisibility)
|
||||
continue
|
||||
var/perpname = "wot"
|
||||
holder = perp.hud_list[ID_HUD]
|
||||
if(perp.wear_id)
|
||||
@@ -51,11 +53,14 @@
|
||||
var/image/holder
|
||||
var/turf/T = get_turf_or_move(src.loc)
|
||||
for(var/mob/living/carbon/human/patient in view(T))
|
||||
|
||||
if(src.see_invisible < patient.invisibility)
|
||||
continue
|
||||
var/foundVirus = 0
|
||||
for(var/datum/disease/D in patient.viruses)
|
||||
if(!D.hidden[SCANNER])
|
||||
foundVirus = 1
|
||||
foundVirus++
|
||||
if(patient.virus2)
|
||||
foundVirus++
|
||||
|
||||
holder = patient.hud_list[HEALTH_HUD]
|
||||
if(patient.stat == 2)
|
||||
|
||||
@@ -298,7 +298,7 @@ var/list/slot_equipment_priority = list( \
|
||||
|
||||
/mob/verb/memory()
|
||||
set name = "Notes"
|
||||
set category = "OOC"
|
||||
set category = "IC"
|
||||
if(mind)
|
||||
mind.show_memory(src)
|
||||
else
|
||||
@@ -306,7 +306,7 @@ var/list/slot_equipment_priority = list( \
|
||||
|
||||
/mob/verb/add_memory(msg as message)
|
||||
set name = "Add Note"
|
||||
set category = "OOC"
|
||||
set category = "IC"
|
||||
|
||||
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
|
||||
msg = sanitize(msg)
|
||||
|
||||
@@ -125,16 +125,20 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
|
||||
|
||||
busy = 1
|
||||
use_power(max(1000, (3750*amount/10)))
|
||||
spawn(16)
|
||||
var/stacktype = stack.type
|
||||
stack.use(amount)
|
||||
if(do_after(usr,16))
|
||||
user << "\blue You add [amount] sheets to the [src.name]."
|
||||
if(istype(stack, /obj/item/stack/sheet/glass))
|
||||
g_amount += amount * 3750
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
|
||||
gold_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/diamond))
|
||||
diamond_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/uranium))
|
||||
uranium_amount += amount * 2000
|
||||
stack.use(amount)
|
||||
busy = 0
|
||||
src.updateUsrDialog()
|
||||
switch(stacktype)
|
||||
if(/obj/item/stack/sheet/glass)
|
||||
g_amount += amount * 3750
|
||||
if(/obj/item/stack/sheet/mineral/gold)
|
||||
gold_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/diamond)
|
||||
diamond_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/uranium)
|
||||
uranium_amount += amount * 2000
|
||||
else
|
||||
new stacktype(src.loc, amount)
|
||||
busy = 0
|
||||
src.updateUsrDialog()
|
||||
@@ -152,28 +152,32 @@ Note: Must be placed west/left of and R&D console to function.
|
||||
icon_state = "protolathe"
|
||||
busy = 1
|
||||
use_power(max(1000, (3750*amount/10)))
|
||||
spawn(16)
|
||||
var/stacktype = stack.type
|
||||
stack.use(amount)
|
||||
if (do_after(user, 16))
|
||||
user << "\blue You add [amount] sheets to the [src.name]."
|
||||
icon_state = "protolathe"
|
||||
if(istype(stack, /obj/item/stack/sheet/metal))
|
||||
m_amount += amount * 3750
|
||||
else if(istype(stack, /obj/item/stack/sheet/glass))
|
||||
g_amount += amount * 3750
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
|
||||
gold_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/silver))
|
||||
silver_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/plasma))
|
||||
plasma_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/uranium))
|
||||
uranium_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/diamond))
|
||||
diamond_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/clown))
|
||||
clown_amount += amount * 2000
|
||||
else if(istype(stack, /obj/item/stack/sheet/mineral/adamantine))
|
||||
adamantine_amount += amount * 2000
|
||||
stack.use(amount)
|
||||
busy = 0
|
||||
src.updateUsrDialog()
|
||||
switch(stacktype)
|
||||
if(/obj/item/stack/sheet/metal)
|
||||
m_amount += amount * 3750
|
||||
if(/obj/item/stack/sheet/glass)
|
||||
g_amount += amount * 3750
|
||||
if(/obj/item/stack/sheet/mineral/gold)
|
||||
gold_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/silver)
|
||||
silver_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/plasma)
|
||||
plasma_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/uranium)
|
||||
uranium_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/diamond)
|
||||
diamond_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/clown)
|
||||
clown_amount += amount * 2000
|
||||
if(/obj/item/stack/sheet/mineral/adamantine)
|
||||
adamantine_amount += amount * 2000
|
||||
else
|
||||
new stacktype(src.loc, amount)
|
||||
busy = 0
|
||||
src.updateUsrDialog()
|
||||
return
|
||||
@@ -51,7 +51,7 @@
|
||||
if(w.isOn())
|
||||
if(w.get_fuel() >= 4 && !src.method)
|
||||
if(inside)
|
||||
inside.loc = src.loc
|
||||
inside.loc = get_turf(src)
|
||||
for(var/mob/M in viewers(world.view, user))
|
||||
M.show_message("<span class='info'>[src] burns away revealing [inside].</span>",1)
|
||||
else
|
||||
|
||||
@@ -28,14 +28,16 @@
|
||||
# +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag
|
||||
|
||||
Admin Observer
|
||||
Retired Admin +MOD +ADMIN
|
||||
Moderator +MOD
|
||||
Admin Candidate +ADMIN
|
||||
Trial Admin +@ +SPAWN +REJUV +VAREDIT +BAN
|
||||
Badmin +@ +POSSESS +BUILDMODE +SERVER +FUN
|
||||
Game Admin +@ +STEALTH +SOUNDS +DEBUG
|
||||
Game Admin +@ +STEALTH +SOUNDS +DEBUG +PERMISSIONS
|
||||
Game Master +EVERYTHING
|
||||
Head Admin +EVERYTHING
|
||||
Retired Admin +ADMIN +STEALTH
|
||||
|
||||
Host +EVERYTHING
|
||||
|
||||
Coder +DEBUG +VAREDIT +SERVER +SPAWN
|
||||
Developer +DEBUG +VAREDIT +SERVER +SPAWN +REJUV +POSSESS +BUILDMODE
|
||||
Dev Mod +@ +MOD
|
||||
+1
-28
@@ -5,31 +5,4 @@
|
||||
# Ranks can be anything defined in admin_ranks.txt ~Carn #
|
||||
######################################################################
|
||||
|
||||
abi79 - Game Master
|
||||
arcalane - Game Admin
|
||||
asanadas - Game Admin
|
||||
bobbehluvspropane - Game Admin
|
||||
cacophony - Game Admin
|
||||
cajoes - Game Admin
|
||||
cib - Retired Admin
|
||||
compactninja - Retired Admin
|
||||
duntadaman - Game Admin
|
||||
dysthymia - Retired Admin
|
||||
doughnuts - Game Admin
|
||||
erthilo - Game Master
|
||||
hawkv3 - Game Master
|
||||
headswe - Game Master
|
||||
iaryni - Game Master
|
||||
masterofapples - Game Admin
|
||||
megacaesar - Retired Admin
|
||||
miniature - Game Master
|
||||
misterbook - Game Admin
|
||||
misterfox - Retired Admin
|
||||
mloc - Game Master
|
||||
skymarshal - Game Master
|
||||
spaceman96 - Retired Admin
|
||||
strumpetplaya - Retired Admin
|
||||
tastyfish - Retired Admin
|
||||
uristqwerty - Game Master
|
||||
wrongnumber - Game Admin
|
||||
mij - Game Admin
|
||||
# not_a_user - Admin
|
||||
|
||||
@@ -1,54 +1 @@
|
||||
botanistpower - Tajaran
|
||||
bountylord13 - Soghun
|
||||
bowlsoldier - Tajaran
|
||||
bluefishie - Skrell
|
||||
cubejackal - Soghun
|
||||
danny220 - Skrell
|
||||
danny220 - Soghun
|
||||
danny220 - Tajaran
|
||||
darkwingstalker - Skrell
|
||||
deciusreln - Skrell
|
||||
densane - Skrell
|
||||
dopeghoti - Tajaran
|
||||
duntadaman - Skrell
|
||||
fenrisian - Tajaran
|
||||
firefishie - Skrell
|
||||
focksinabocks - Skrell
|
||||
focksinabocks - Tajaran
|
||||
foolamancer - Skrell
|
||||
forsamori - Tajaran
|
||||
forsamori - Soghun
|
||||
galenus - Soghun
|
||||
galenus - Skrell
|
||||
galenus - Tajaran
|
||||
kersh - Skrell
|
||||
jadepython - Skrell
|
||||
jadepython - Soghun
|
||||
jadepython - Tajaran
|
||||
masterofstuff - Skrell
|
||||
masterofstuff - Soghun
|
||||
mangled - Skrell
|
||||
mcgulliver - Skrell
|
||||
nerezza - Skrell
|
||||
nerezza - Soghun
|
||||
nerezza - Tajaran
|
||||
nestromo - Soghun
|
||||
philphil123 - Soghun
|
||||
quilan - Tajaran
|
||||
searif - Soghun
|
||||
searif - Tajaran
|
||||
searif - Skrell
|
||||
serithi - Skrell
|
||||
serithi - Soghun
|
||||
serithi - Tajaran
|
||||
sniperyeti - Skrell
|
||||
spaceman96 - Tajaran
|
||||
spaceman96 - Soghun
|
||||
spaceman96 - Skrell
|
||||
sparklysheep - Skrell
|
||||
succubusy - Skrell
|
||||
teddybehr - Soghun
|
||||
whitellama - Skrell
|
||||
watermelonstorm - Tajaran
|
||||
yoshax - Tajaran
|
||||
jamini - Tajaran
|
||||
some~user - Species
|
||||
+18
-23
@@ -75,23 +75,24 @@ LOG_PDA
|
||||
## default probablity is 1, increase to make that mode more likely to be picked
|
||||
## set to 0 to disable that mode
|
||||
## Cult mode is in alpha test, enable at your own risk
|
||||
PROBABILITY EXTENDED 0
|
||||
PROBABILITY TRAITOR 2
|
||||
PROBABILITY EXTENDED 1
|
||||
PROBABILITY TRAITOR 0
|
||||
PROBABILITY METEOR 0
|
||||
PROBABILITY MALFUNCTION 2
|
||||
PROBABILITY MALFUNCTION 1
|
||||
PROBABILITY BLOB 0
|
||||
PROBABILITY NUCLEAR 0
|
||||
PROBABILITY NUCLEAR 1
|
||||
PROBABILITY SANDBOX 0
|
||||
PROBABILITY WIZARD 0
|
||||
PROBABILITY WIZARD 1
|
||||
PROBABILITY RESTRUCTURING 0
|
||||
PROBABILITY REVOLUTION 5
|
||||
PROBABILITY CHANGELING 0
|
||||
PROBABILITY REVOLUTION 0
|
||||
PROBABILITY CHANGELING 1
|
||||
PROBABILITY CULT 1
|
||||
PROBABILITY MONKEY 0
|
||||
PROBABILITY TRAITORCHAN 0
|
||||
PROBABILITY EXTEND-A-TRAITORMONGOUS 0
|
||||
PROBABILITY EPIDEMIC 1
|
||||
PROBABILITY EXTEND-A-TRAITORMONGOUS 6
|
||||
PROBABILITY EPIDEMIC 0
|
||||
PROBABILITY MEME 0
|
||||
PROBABILITY RP-REVOLUTION 0
|
||||
|
||||
## Hash out to disable random events during the round.
|
||||
ALLOW_RANDOM_EVENTS
|
||||
@@ -109,10 +110,10 @@ ALLOW_ADMIN_OOCCOLOR
|
||||
# ALLOW_METADATA
|
||||
|
||||
## allow players to initiate a restart vote
|
||||
#ALLOW_VOTE_RESTART
|
||||
ALLOW_VOTE_RESTART
|
||||
|
||||
## allow players to initate a mode-change start
|
||||
#ALLOW_VOTE_MODE
|
||||
ALLOW_VOTE_MODE
|
||||
|
||||
## min delay (deciseconds) between voting sessions (default 10 minutes)
|
||||
VOTE_DELAY 6000
|
||||
@@ -121,7 +122,7 @@ VOTE_DELAY 6000
|
||||
VOTE_PERIOD 600
|
||||
|
||||
## prevents dead players from voting or starting votes
|
||||
# NO_DEAD_VOTE
|
||||
#NO_DEAD_VOTE
|
||||
|
||||
## players' votes default to "No vote" (otherwise, default to "No change")
|
||||
DEFAULT_NO_VOTE
|
||||
@@ -137,7 +138,7 @@ ALLOW_AI
|
||||
# DONT_DEL_NEWMOB
|
||||
|
||||
## set a hosted by name for unix platforms
|
||||
HOSTEDBY Yournamehere
|
||||
HOSTEDBY yournamehere
|
||||
|
||||
## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
|
||||
## Set to 1 to jobban them from those positions, set to 0 to allow them.
|
||||
@@ -150,7 +151,7 @@ GUEST_BAN
|
||||
# USEWHITELIST
|
||||
|
||||
## set a server location for world reboot. Don't include the byond://, just give the address and port.
|
||||
# SERVER ss13.example.com:2506
|
||||
#SERVER server.net:port
|
||||
|
||||
## forum address
|
||||
# FORUMURL http://example.com
|
||||
@@ -205,16 +206,10 @@ GATEWAY_DELAY 18000
|
||||
## Uncomment to restrict non-admins from using humanoid alien races
|
||||
USEALIENWHITELIST
|
||||
|
||||
## Location of the nudge.py script
|
||||
NUDGE_SCRIPT_PATH nudge.py
|
||||
|
||||
## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player.
|
||||
ALIEN_PLAYER_RATIO 0.2
|
||||
|
||||
#ALIEN_PLAYER_RATIO 0.2
|
||||
##Remove the # to let ghosts spin chairs
|
||||
## Uncomment this to enable external .rsc downloads. URLs must be separated by no more than one space.
|
||||
## The linked .zip file should contain the required .rsc
|
||||
#resource_urls http://firstserver.org/myresource.zip http://secondserver.org/myresource.zip http://10.22.11.1/myresource.zip
|
||||
#GHOST_INTERACTION
|
||||
|
||||
## Uncomment to enable sending data to the IRC bot.
|
||||
#USE_IRC_BOT
|
||||
@@ -227,4 +222,4 @@ ALIEN_PLAYER_RATIO 0.2
|
||||
|
||||
## Path to the python executable on the system. Leave blank for default.
|
||||
## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
|
||||
PYTHON_PATH
|
||||
PYTHON_PATH
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
asanadas: Book Berner: /obj/item/clothing/glasses/meson/fluff/book_berner_1
|
||||
atomicdog92: Seth Sealis: /obj/item/clothing/suit/det_suit/fluff/leatherjack
|
||||
botanistpower: Walter Brooks: /obj/item/clothing/gloves/fluff/walter_brooks_1
|
||||
bountylord13: Norah Briggs: /obj/item/clothing/head/welding/fluff/norah_briggs_1
|
||||
chinsky: Victor Kaminski: /obj/item/fluff/victor_kaminsky_1
|
||||
chinsky: Summer Springfield: /obj/item/weapon/camera_test/fluff/orange
|
||||
compactninja: Al Peterson: /obj/item/clothing/head/flatcap
|
||||
compactninja: Lister Black: /obj/item/weapon/storage/pill_bottle/fluff/listermedbottle, /obj/item/weapon/storage/pill_bottle/fluff/listermedbottle
|
||||
crazy2455: Murad Hassim: /obj/item/clothing/gloves/fluff/murad_hassim_1
|
||||
cubejackal: Barry Sharke: /obj/item/clothing/mask/fluff/electriccig
|
||||
daaneesh: Zelda Creedy: /obj/item/weapon/crowbar/fluff/zelda_creedy_1
|
||||
deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap, /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield
|
||||
donofnyc3: Oen'g Issek: /obj/item/weapon/melee/baton/fluff/oeng_baton
|
||||
eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
|
||||
executivekill: Hunter Duke: /obj/item/weapon/lighter/zippo/fluff/executivekill_1
|
||||
fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetime
|
||||
fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
|
||||
fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
|
||||
foolamancer: Edvin Telephosphor: /obj/item/clothing/head/fluff/edvin_telephosphor_1
|
||||
furohman: Fay Sullivan: /obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1
|
||||
furlucis: Chal Appara: /obj/item/clothing/gloves/fluff/chal_appara_1
|
||||
gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1
|
||||
jamini: Edwin Atweeke: /obj/item/clothing/suit/labcoat/fluff/burnt
|
||||
jamini: Nasir Khayyam: /obj/item/clothing/tie/fluff/nasir_khayyam_1
|
||||
jadepython: Thysse Ezinwa: /obj/item/clothing/glasses/eyepatch/fluff/thysse_1
|
||||
kirbyelder: John McKeever: /obj/item/paper/fluff/john_mckeever_1
|
||||
leon_the_killer: johnathan Falcian: /obj/item/weapon/clipboard/notebook/fluff/johnathan_falcian_1
|
||||
leonheart11: Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
|
||||
lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
|
||||
lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote, /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/shinyflask
|
||||
madmalicemccrea: Alice McCrea: /obj/item/clothing/head/welding/fluff/alice_mccrea_1
|
||||
magmaram: Maria Crash: /obj/item/device/camera/fluff/oldcamera
|
||||
mangled: Li Matsuda: /obj/item/weapon/lighter/zippo/fluff/li_matsuda_1
|
||||
maximumbob: Maurice Bedford: /obj/item/fluff/maurice_bedford_1
|
||||
mcgulliver: Wox Derax: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/lithiumflask
|
||||
mindphyre: Arjun Chopra: /obj/item/clothing/glasses/fluff/arjun_chopra_1
|
||||
misterbook: Smoke Perkins: /obj/item/clothing/mask/cigarette/pipe
|
||||
misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
|
||||
morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
|
||||
naples: Russell Vierson: /obj/item/weapon/lighter/zippo/fluff/naples_1
|
||||
nega10: Ty Foster: /obj/item/clothing/mask/mara_kilpatrick_1
|
||||
nerezza: Asher Spock: /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1
|
||||
nerezza: Asher Spock: /obj/item/weapon/card/id/fluff/asher_spock_2
|
||||
orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen
|
||||
orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
|
||||
paththegreat: Eli Stevens: /obj/item/weapon/pen/fluff/fountainpen
|
||||
phaux: Tian Krieger: /obj/item/clothing/under/fluff/tian_dress
|
||||
rawrtaicho: Riley Rohtin: /obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1
|
||||
rawrtaicho: Wyatt Engstrom: /obj/item/clothing/under/fluff/wyatt_1
|
||||
roaper: Ian Colm: /obj/item/weapon/card/id/fluff/ian_colm_1
|
||||
roaper: Ian Colm: /obj/item/clothing/glasses/welding/fluff/ian_colm_2
|
||||
rukral: Nashida Bishara: /obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1
|
||||
searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown, /obj/item/clothing/head/welding/fluff/yuki_matsuda_1
|
||||
searif: Ara Al-Jazari: /obj/item/clothing/under/rank/bartender/fluff/classy
|
||||
serithi: Altair An-Nasaqan: /obj/item/clothing/tie/fluff/altair_locket
|
||||
sirribbit: /obj/item/weapon/clipboard/fluff/mcreary_journal
|
||||
sicktrigger: David Fanning: /obj/item/fluff/david_fanning_1
|
||||
silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1
|
||||
sniperyeti: Susan Harris: /obj/item/clothing/shoes/magboots/fluff/susan_harris_1
|
||||
spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/labcoat/fluff/pink
|
||||
sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1
|
||||
sparklysheep: Uzenwa Sissra: /obj/item/clothing/glasses/fluff/uzenwa_sissra_1
|
||||
suethecake: Ana Ka'Rimah: /obj/item/weapon/gun/energy/stunrevolver/fluff/ana_peacemaker
|
||||
superboredguy: Neil Patterson: /obj/item/clothing/head/hardhat/fluff/neil_patterson_1
|
||||
staghorn: Mara Kilpatrick: /obj/item/clothing/mask/mara_kilpatrick_1
|
||||
tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
|
||||
thatoneguy: Hugo Cinderbatch: /obj/item/weapon/fluff/hugo_cinderbacth_1
|
||||
thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1
|
||||
themij: Taryn Keppel: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
|
||||
thejesster14: Rosa Wolff: /obj/item/device/flashlight/fluff/thejesster14_1
|
||||
tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
|
||||
vinceluk: Ashley Rifler: /obj/item/clothing/gloves/fluff/ashley_rifler_1
|
||||
vinceluk: Seth Sealis: /obj/item/clothing/suit/det_suit/fluff/graycoat
|
||||
whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
|
||||
whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1
|
||||
zuhayr: Jane Doe: /obj/item/clothing/under/fluff/jane_sidsuit
|
||||
mordeth221: Sven Fjeltson: /obj/item/weapon/fluff/sven_fjeltson_1
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
rowtree-Lucy
|
||||
sydrec-SINA
|
||||
mordeth221-Elly
|
||||
ravensdale-Blunt
|
||||
ravensdale-Skuld
|
||||
serithi-REMNANT
|
||||
@@ -1,7 +1,7 @@
|
||||
### HEALTH ###
|
||||
|
||||
## level of health at which a mob becomes unconscious (crit)
|
||||
HEALTH_THRESHOLD_CRIT 0
|
||||
HEALTH_THRESHOLD_CRIT -50
|
||||
|
||||
## level of health at which a mob becomes dead
|
||||
HEALTH_THRESHOLD_DEAD -100
|
||||
@@ -19,7 +19,7 @@ ORGAN_HEALTH_MULTIPLIER 100
|
||||
|
||||
## multiplier which influences how fast organs regenerate naturally
|
||||
## 100 means normal, 50 means half
|
||||
ORGAN_REGENERATION_MULTIPLIER 20
|
||||
ORGAN_REGENERATION_MULTIPLIER 75
|
||||
|
||||
### REVIVAL ###
|
||||
|
||||
@@ -42,8 +42,8 @@ REVIVAL_BRAIN_LIFE -1
|
||||
|
||||
|
||||
## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
|
||||
RUN_DELAY 0
|
||||
WALK_DELAY 0
|
||||
RUN_SPEED 2
|
||||
WALK_SPEED 5
|
||||
|
||||
|
||||
## The variables below affect the movement of specific mob types.
|
||||
|
||||
+1
-20
@@ -1,22 +1,3 @@
|
||||
; just add the ckey (lowercase) of every moderator on a separate line
|
||||
; lines starting with ; are comments and will be ignored
|
||||
botanistpower
|
||||
bowlsoldier
|
||||
cubejackal
|
||||
dakonic
|
||||
densane
|
||||
deusdactyl
|
||||
fastler
|
||||
fenrisian
|
||||
foolamancer
|
||||
madmalicemccrea
|
||||
mangled
|
||||
phaux
|
||||
roaper
|
||||
searif
|
||||
sparklysheep
|
||||
themij
|
||||
chinsky
|
||||
danny220
|
||||
; Why u no keep list in alphabetical order?! Lazies! Lazies! -Abi
|
||||
; Imma best alphabetiser - Erthilo
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 277 KiB After Width: | Height: | Size: 279 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 69 KiB |
+903
-1355
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,7 @@
|
||||
# Two arguments, channel and message.
|
||||
# EG: "ircbot_message.py #adminchannel ADMINHELP, people are killing me!"
|
||||
|
||||
import sys,pickle,socket
|
||||
import sys,cPickle,socket
|
||||
|
||||
def pack():
|
||||
ip = sys.argv[1]
|
||||
@@ -12,7 +12,7 @@ def pack():
|
||||
except:
|
||||
data = "NO DATA SPECIFIED"
|
||||
dictionary = {"ip":ip,"data":["PASSWORD"] + data}
|
||||
pickled = pickle.dumps(dictionary)
|
||||
pickled = cPickle.dumps(dictionary)
|
||||
nudge(pickled)
|
||||
def nudge(data):
|
||||
HOST = "IRCBOT IP"
|
||||
|
||||
Reference in New Issue
Block a user