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

Changed a lot of things, too lazy to recall them atm. Attempted a shotgun-on-back fix, but didn't work.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@305 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-17 14:27:57 +00:00
parent f47e4661d8
commit 5490a3e40e
19 changed files with 4814 additions and 5035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/WorkInProgress/Chemistry-Reagents.dm
View File

@@ -44,7 +44,20 @@ datum
on_mob_life(var/mob/M)
holder.remove_reagent(src.id, 0.4) //By default it slowly disappears.
return
/*
metroid
name = "Metroid Jelly"
id = "metroid"
description = "A green liquid produced from one of the deadliest lifeforms in existence."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(prob(10))
M << "You don't feel too good."
M.toxloss+=20
else if(prob(40))
M.bruteloss-=5
..() //Code no work :< -- Urist
*/
milk
name = "Milk"
id = "milk"

32
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -1913,3 +1913,35 @@
name = "Drinking glass"
desc = "Your standard drinking glass"
return
///jar
/*
/obj/item/weapon/reagent_containers/food/drinks/jar
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
icon = 'food.dmi'
icon_state = "jar"
item_state = "beaker"
New()
var/datum/reagents/R = new/datum/reagents(50)
reagents = R
R.my_atom = src
on_reagent_change()
if (reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
if("metroid")
icon_state = "jar_metroid"
name = "metroid jam"
desc = "A jar of metroid jam. Delicious!"
else
icon_state ="jar_what"
name = "jar of something"
desc = "You can't really tell what this is."
else
icon_state = "jar"
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
return //Code no work :< -- Urist
*/

8
code/defines/mob/living/carbon/metroid.dm Normal file
View File

@@ -0,0 +1,8 @@
/mob/living/carbon/alien/larva/metroid
name = "baby metroid"
icon = 'mob.dmi'
icon_state = "metroid"
health = 250
update_icon = 0

1
code/defines/mob/mob.dm
View File

@@ -39,6 +39,7 @@
var/poll_answer = 0.0
var/sdisabilities = 0
var/disabilities = 0
var/midis = 1 //Check if midis should be played for someone -- Urist
var/atom/movable/pulling = null
var/stat = 0.0
var/next_move = null

2
code/defines/obj/weapon.dm
View File

@@ -517,7 +517,7 @@
/obj/item/weapon/gun/shotgun
name = "shotgun"
icon_state = "shotgun"
w_class = 4.0
w_class = 3.0 //should go on back now, has no sprite for that atm because I can't sprite for shit -- Urist
force = 7.0
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
var/pumped = 0.0

20
code/game/machinery/processor.dm
View File

@@ -47,9 +47,23 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
new /obj/item/weapon/reagent_containers/food/snacks/ketchup(src.loc)
return
user << "There doesn't appear to be anything in the processing chamber."
/*
/obj/machinery/processor/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
if(istype(G.affecting, /mob/living/carbon/alien/larva/metroid))
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
var/mob/dead/observer/newmob
if (G.affecting.client)
newmob = new/mob/dead/observer(G.affecting)
G.affecting:client:mob = newmob
newmob:client:eye = newmob
del(G.affecting)
del(G)
var/obj/item/weapon/reagent_containers/food/drinks/jar/J = new /obj/item/weapon/reagent_containers/food/drinks/jar(src.loc)
J.add_reagent("metroid",50) //Code no work :< -- Urist
*/
/*
/obj/item/weapon/reagent_containers/food/snacks/grown/berries

2
code/game/objects/kitchen.dm
View File

@@ -22,7 +22,7 @@
else
user << "\red The spike already has something on it, finish collecting its meat first!"
else if(istype(G.affecting, /mob/living/carbon/alien))
else if(istype(G.affecting, /mob/living/carbon/alien) && !istype(G.affecting, /mob/living/carbon/alien/larva/metroid))
if(src.occupied == 0)
src.icon_state = "spikebloodygreen"
src.occupied = 1

11
code/game/verbs/sound.dm Normal file
View File

@@ -0,0 +1,11 @@
/mob/verb/togglemidis()
set category = "Special Verbs"
set name = "Toggle Midis"
if(usr.midis)
usr.midis=0
usr << "You will now stop receiving any sounds uploaded by admins."
else
usr.midis=1
usr << "You will now start receiving any sounds uploaded by admins."
return

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

@@ -1155,6 +1155,15 @@ var/showadminmessages = 1
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
if("dorf")
if (src.rank in list("Shit Guy","Coder", "Host"))
for(var/mob/living/carbon/human/B in world)
B.face_icon_state = "facial_longbeard"
B.update_face()
message_admins("[key_name_admin(usr)] activated dorf mode")
else
alert("You cannot perform this action. You must be of a higher administrative rank!")
return
if (usr)
log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
if (ok)
@@ -1486,7 +1495,8 @@ var/showadminmessages = 1
<A href='?src=\ref[src];secretsfun=cleanexcrement'>Remove all urine/poo from station</A><BR>
<A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR><BR>"}
<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
<A href='?src=\ref[src];secretsfun=dorf'>Dorf Mode</A><BR><BR>"}
//<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
if(lvl >= 5)

14
code/modules/admin/verbs/playsound.dm
View File

@@ -1,5 +1,5 @@
/client/proc/play_sound(S as sound)
set category = "Special Verbs"
set category = "Fun"
set name = "Play Global Sound"
//if(Debug2)
@@ -14,13 +14,17 @@
if(src.holder.rank == "Host" || src.holder.rank == "Coder" || src.holder.rank == "Shit Guy")
log_admin("[key_name(src)] played sound [S]")
message_admins("[key_name_admin(src)] played sound [S]", 1)
world << uploaded_sound
for(var/mob/M in world)
if(M.midis)
M << uploaded_sound
else
if(usr.client.canplaysound)
usr.client.canplaysound = 0
log_admin("[key_name(src)] played sound [S]")
message_admins("[key_name_admin(src)] played sound [S]", 1)
world << uploaded_sound
for(var/mob/M in world)
if(M.midis)
M << uploaded_sound
else
usr << "You already used up your jukebox monies this round!"
del(uploaded_sound)
@@ -36,7 +40,9 @@
set category = "Fun"
set name = "Cuban Pete Time"
world << 'cubanpetetime.ogg'
for(var/mob/M in world)
if(M.midis)
M << 'cubanpetetime.ogg'
for(var/mob/living/carbon/human/CP in world)
if(CP.real_name=="Cuban Pete" && CP.key!="Rosham")

6
code/modules/admin/verbs/randomverbs.dm
View File

@@ -165,7 +165,7 @@
/client/proc/cmd_admin_add_random_ai_law()
set category = "Admin"
set category = "Fun"
set name = "Add Random AI Law"
if(!src.authenticated || !src.holder)
src << "Only administrators may use this command."
@@ -229,7 +229,7 @@
/client/proc/cmd_admin_add_freeform_ai_law()
set category = "Admin"
set category = "Fun"
set name = "Add Custom AI law"
if(!src.authenticated || !src.holder)
src << "Only administrators may use this command."
@@ -361,7 +361,7 @@
/client/proc/cmd_admin_gib_self()
set name = "Gibself"
set category = "Special Verbs"
set category = "Fun"
if (istype(src.mob, /mob/dead/observer)) // so they don't spam gibs everywhere
return
else

6
code/modules/mob/living/carbon/alien/larva/larva.dm
View File

@@ -63,7 +63,7 @@ to clean it up, or just beat the shit out of it (which takes ages).
src << "\blue Your icons have been generated!"
update_clothing()
spawn(1200) grow() // Grow after 120 seconds -- TLE
// spawn(1200) grow() Grow after 120 seconds -- TLE Commented out because life.dm has better version -- Urist
..()
@@ -544,11 +544,11 @@ to clean it up, or just beat the shit out of it (which takes ages).
src.stat = 0
/* Commented out because it's duplicated in life.dm
/mob/living/carbon/alien/larva/proc/grow() // Larvae can grow into full fledged Xenos if they survive long enough -- TLE
if(src.icon_state == "larva_l" && !src.canmove) // This is a shit death check. It is made of shit and death. Fix later.
return
else
var/mob/living/carbon/alien/humanoid/A = new(src.loc)
A.key = src.key
del(src)
del(src) */

3
code/modules/mob/living/carbon/alien/larva/life.dm
View File

@@ -97,7 +97,8 @@
spawn(10)
del(src)
return
//grow!!
//grow!! but not if metroid or dead
if(!istype(src,/mob/living/carbon/alien/larva/metroid) && src.health>-100)
src.amount_grown++
if (src.radiation)

10
code/modules/mob/new_player/preferences.dm
View File

@@ -5,6 +5,7 @@ datum/preferences
var/b_type = "A+"
var/be_syndicate
var/midis = 1
var/be_random_name = 0
var/underwear = 1
@@ -154,6 +155,7 @@ datum/preferences
dat += "<br>"
dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[src.UI == 'screen1.dmi' ? "New" : "Old"]</b></a><br>"
dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[src.midis == 1 ? "Yes" : "No"]</b></a><br>"
dat += "<hr><b>Occupation Choices</b><br>"
if (destructive.Find(src.occupation1))
@@ -498,6 +500,12 @@ datum/preferences
else
src.UI = 'screen1.dmi'
if (link_tags["midis"])
if (src.midis)
src.midis = 0
else
src.midis = 1
if (link_tags["underwear"])
if(!IsGuestKey(user.key))
if (src.underwear == 1)
@@ -544,6 +552,7 @@ datum/preferences
s_tone = 0.0
b_type = "A+"
UI = 'screen1_old.dmi'
midis = 1
src.ShowChoices(user)
@@ -576,6 +585,7 @@ datum/preferences
character.f_style = f_style
character.UI = UI
character.midis = midis
switch(h_style)
if("Short Hair")

366
goonstation.dme
View File

@@ -6,452 +6,121 @@
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
#define FILE_DIR ".svn"
#define FILE_DIR ".svn/prop-base"
#define FILE_DIR ".svn/text-base"
#define FILE_DIR ".svn/tmp"
#define FILE_DIR "code"
#define FILE_DIR "code/.svn"
#define FILE_DIR "code/.svn/text-base"
#define FILE_DIR "code/ATMOSPHERICS"
#define FILE_DIR "code/ATMOSPHERICS/.svn"
#define FILE_DIR "code/ATMOSPHERICS/.svn/text-base"
#define FILE_DIR "code/ATMOSPHERICS/components"
#define FILE_DIR "code/ATMOSPHERICS/components/.svn"
#define FILE_DIR "code/ATMOSPHERICS/components/.svn/text-base"
#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices"
#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn"
#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn/text-base"
#define FILE_DIR "code/ATMOSPHERICS/components/unary"
#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn"
#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn/text-base"
#define FILE_DIR "code/atoms"
#define FILE_DIR "code/atoms/.svn"
#define FILE_DIR "code/atoms/clothing"
#define FILE_DIR "code/atoms/clothing/.svn"
#define FILE_DIR "code/atoms/mob"
#define FILE_DIR "code/atoms/mob/.svn"
#define FILE_DIR "code/atoms/mob/living"
#define FILE_DIR "code/atoms/mob/living/.svn"
#define FILE_DIR "code/atoms/mob/living/sapien"
#define FILE_DIR "code/atoms/mob/living/sapien/.svn"
#define FILE_DIR "code/atoms/objects"
#define FILE_DIR "code/atoms/objects/.svn"
#define FILE_DIR "code/atoms/objects/radio"
#define FILE_DIR "code/atoms/objects/radio/.svn"
#define FILE_DIR "code/atoms/objects/storage"
#define FILE_DIR "code/atoms/objects/storage/.svn"
#define FILE_DIR "code/datums"
#define FILE_DIR "code/datums/.svn"
#define FILE_DIR "code/datums/.svn/text-base"
#define FILE_DIR "code/datums/diseases"
#define FILE_DIR "code/datums/diseases/.svn"
#define FILE_DIR "code/datums/diseases/.svn/text-base"
#define FILE_DIR "code/defines"
#define FILE_DIR "code/defines/.svn"
#define FILE_DIR "code/defines/.svn/text-base"
#define FILE_DIR "code/defines/area"
#define FILE_DIR "code/defines/area/.svn"
#define FILE_DIR "code/defines/area/.svn/text-base"
#define FILE_DIR "code/defines/mob"
#define FILE_DIR "code/defines/mob/.svn"
#define FILE_DIR "code/defines/mob/.svn/text-base"
#define FILE_DIR "code/defines/mob/dead"
#define FILE_DIR "code/defines/mob/dead/.svn"
#define FILE_DIR "code/defines/mob/dead/.svn/text-base"
#define FILE_DIR "code/defines/mob/living"
#define FILE_DIR "code/defines/mob/living/.svn"
#define FILE_DIR "code/defines/mob/living/.svn/text-base"
#define FILE_DIR "code/defines/mob/living/carbon"
#define FILE_DIR "code/defines/mob/living/carbon/.svn"
#define FILE_DIR "code/defines/mob/living/carbon/.svn/text-base"
#define FILE_DIR "code/defines/mob/living/silicon"
#define FILE_DIR "code/defines/mob/living/silicon/.svn"
#define FILE_DIR "code/defines/mob/living/silicon/.svn/text-base"
#define FILE_DIR "code/defines/obj"
#define FILE_DIR "code/defines/obj/.svn"
#define FILE_DIR "code/defines/obj/.svn/text-base"
#define FILE_DIR "code/defines/obj/clothing"
#define FILE_DIR "code/defines/obj/clothing/.svn"
#define FILE_DIR "code/defines/obj/clothing/.svn/text-base"
#define FILE_DIR "code/defines/obj/spawner"
#define FILE_DIR "code/defines/obj/spawner/.svn"
#define FILE_DIR "code/defines/obj/spawner/.svn/text-base"
#define FILE_DIR "code/defines/procs"
#define FILE_DIR "code/defines/procs/.svn"
#define FILE_DIR "code/defines/procs/.svn/text-base"
#define FILE_DIR "code/defines/turf"
#define FILE_DIR "code/defines/turf/.svn"
#define FILE_DIR "code/FEA"
#define FILE_DIR "code/FEA/.svn"
#define FILE_DIR "code/FEA/.svn/text-base"
#define FILE_DIR "code/game"
#define FILE_DIR "code/game/.svn"
#define FILE_DIR "code/game/.svn/text-base"
#define FILE_DIR "code/game/area"
#define FILE_DIR "code/game/area/.svn"
#define FILE_DIR "code/game/area/.svn/text-base"
#define FILE_DIR "code/game/gamemodes"
#define FILE_DIR "code/game/gamemodes/.svn"
#define FILE_DIR "code/game/gamemodes/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/blob"
#define FILE_DIR "code/game/gamemodes/blob/.svn"
#define FILE_DIR "code/game/gamemodes/blob/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/changeling"
#define FILE_DIR "code/game/gamemodes/changeling/.svn"
#define FILE_DIR "code/game/gamemodes/changeling/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/ctf"
#define FILE_DIR "code/game/gamemodes/ctf/.svn"
#define FILE_DIR "code/game/gamemodes/ctf/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/cultist"
#define FILE_DIR "code/game/gamemodes/deathmatch"
#define FILE_DIR "code/game/gamemodes/deathmatch/.svn"
#define FILE_DIR "code/game/gamemodes/deathmatch/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/extended"
#define FILE_DIR "code/game/gamemodes/extended/.svn"
#define FILE_DIR "code/game/gamemodes/extended/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/malfunction"
#define FILE_DIR "code/game/gamemodes/malfunction/.svn"
#define FILE_DIR "code/game/gamemodes/malfunction/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/meteor"
#define FILE_DIR "code/game/gamemodes/meteor/.svn"
#define FILE_DIR "code/game/gamemodes/meteor/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/monkey"
#define FILE_DIR "code/game/gamemodes/monkey/.svn"
#define FILE_DIR "code/game/gamemodes/monkey/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/nuclear"
#define FILE_DIR "code/game/gamemodes/nuclear/.svn"
#define FILE_DIR "code/game/gamemodes/nuclear/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/restructuring"
#define FILE_DIR "code/game/gamemodes/restructuring/.svn"
#define FILE_DIR "code/game/gamemodes/restructuring/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/revolution"
#define FILE_DIR "code/game/gamemodes/revolution/.svn"
#define FILE_DIR "code/game/gamemodes/revolution/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/ruby"
#define FILE_DIR "code/game/gamemodes/ruby/.svn"
#define FILE_DIR "code/game/gamemodes/ruby/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/sandbox"
#define FILE_DIR "code/game/gamemodes/sandbox/.svn"
#define FILE_DIR "code/game/gamemodes/sandbox/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/traitor"
#define FILE_DIR "code/game/gamemodes/traitor/.svn"
#define FILE_DIR "code/game/gamemodes/traitor/.svn/text-base"
#define FILE_DIR "code/game/gamemodes/wizard"
#define FILE_DIR "code/game/gamemodes/wizard/.svn"
#define FILE_DIR "code/game/gamemodes/wizard/.svn/text-base"
#define FILE_DIR "code/game/jobs"
#define FILE_DIR "code/game/jobs/.svn"
#define FILE_DIR "code/game/jobs/.svn/text-base"
#define FILE_DIR "code/game/jobs/.svn/tmp"
#define FILE_DIR "code/game/machinery"
#define FILE_DIR "code/game/machinery/.svn"
#define FILE_DIR "code/game/machinery/.svn/text-base"
#define FILE_DIR "code/game/machinery/antimatter_engine"
#define FILE_DIR "code/game/machinery/antimatter_engine/.svn"
#define FILE_DIR "code/game/machinery/atmoalter"
#define FILE_DIR "code/game/machinery/atmoalter/.svn"
#define FILE_DIR "code/game/machinery/atmoalter/.svn/text-base"
#define FILE_DIR "code/game/machinery/bots"
#define FILE_DIR "code/game/machinery/bots/.svn"
#define FILE_DIR "code/game/machinery/bots/.svn/text-base"
#define FILE_DIR "code/game/machinery/computer"
#define FILE_DIR "code/game/machinery/computer/.svn"
#define FILE_DIR "code/game/machinery/computer/.svn/text-base"
#define FILE_DIR "code/game/machinery/doors"
#define FILE_DIR "code/game/machinery/doors/.svn"
#define FILE_DIR "code/game/machinery/doors/.svn/text-base"
#define FILE_DIR "code/game/machinery/embedded_controller"
#define FILE_DIR "code/game/machinery/embedded_controller/.svn"
#define FILE_DIR "code/game/machinery/embedded_controller/.svn/text-base"
#define FILE_DIR "code/game/machinery/pipe"
#define FILE_DIR "code/game/machinery/pipe/.svn"
#define FILE_DIR "code/game/machinery/pipe/.svn/text-base"
#define FILE_DIR "code/game/machinery/power"
#define FILE_DIR "code/game/machinery/power/.svn"
#define FILE_DIR "code/game/magic"
#define FILE_DIR "code/game/magic/.svn"
#define FILE_DIR "code/game/magic/.svn/text-base"
#define FILE_DIR "code/game/magic/cultist"
#define FILE_DIR "code/game/magic/cultist/.svn"
#define FILE_DIR "code/game/magic/cultist/.svn/text-base"
#define FILE_DIR "code/game/objects"
#define FILE_DIR "code/game/objects/.svn"
#define FILE_DIR "code/game/objects/.svn/text-base"
#define FILE_DIR "code/game/objects/alien"
#define FILE_DIR "code/game/objects/alien/.svn"
#define FILE_DIR "code/game/objects/alien/.svn/text-base"
#define FILE_DIR "code/game/objects/closets"
#define FILE_DIR "code/game/objects/closets/.svn"
#define FILE_DIR "code/game/objects/closets/.svn/text-base"
#define FILE_DIR "code/game/objects/closets/secure"
#define FILE_DIR "code/game/objects/closets/secure/.svn"
#define FILE_DIR "code/game/objects/closets/secure/.svn/text-base"
#define FILE_DIR "code/game/objects/devices"
#define FILE_DIR "code/game/objects/devices/.svn"
#define FILE_DIR "code/game/objects/devices/.svn/text-base"
#define FILE_DIR "code/game/objects/items"
#define FILE_DIR "code/game/objects/items/.svn"
#define FILE_DIR "code/game/objects/items/.svn/text-base"
#define FILE_DIR "code/game/objects/items/weapons"
#define FILE_DIR "code/game/objects/items/weapons/.svn"
#define FILE_DIR "code/game/objects/items/weapons/.svn/text-base"
#define FILE_DIR "code/game/objects/radio"
#define FILE_DIR "code/game/objects/radio/.svn"
#define FILE_DIR "code/game/objects/radio/.svn/text-base"
#define FILE_DIR "code/game/objects/secstorage"
#define FILE_DIR "code/game/objects/secstorage/.svn"
#define FILE_DIR "code/game/objects/secstorage/.svn/text-base"
#define FILE_DIR "code/game/objects/spawners"
#define FILE_DIR "code/game/objects/spawners/.svn"
#define FILE_DIR "code/game/objects/spawners/.svn/text-base"
#define FILE_DIR "code/game/objects/storage"
#define FILE_DIR "code/game/objects/storage/.svn"
#define FILE_DIR "code/game/objects/storage/.svn/text-base"
#define FILE_DIR "code/game/spacecraft"
#define FILE_DIR "code/game/spacecraft/.svn"
#define FILE_DIR "code/game/spacecraft/.svn/text-base"
#define FILE_DIR "code/game/verbs"
#define FILE_DIR "code/game/verbs/.svn"
#define FILE_DIR "code/game/verbs/.svn/text-base"
#define FILE_DIR "code/modules"
#define FILE_DIR "code/modules/.svn"
#define FILE_DIR "code/modules/admin"
#define FILE_DIR "code/modules/admin/.svn"
#define FILE_DIR "code/modules/admin/.svn/text-base"
#define FILE_DIR "code/modules/admin/verbs"
#define FILE_DIR "code/modules/admin/verbs/.svn"
#define FILE_DIR "code/modules/admin/verbs/.svn/text-base"
#define FILE_DIR "code/modules/assembly"
#define FILE_DIR "code/modules/assembly/.svn"
#define FILE_DIR "code/modules/ban"
#define FILE_DIR "code/modules/ban/.svn"
#define FILE_DIR "code/modules/build"
#define FILE_DIR "code/modules/build/.svn"
#define FILE_DIR "code/modules/chemical"
#define FILE_DIR "code/modules/chemical/.svn"
#define FILE_DIR "code/modules/combat"
#define FILE_DIR "code/modules/combat/.svn"
#define FILE_DIR "code/modules/combat/guns"
#define FILE_DIR "code/modules/combat/guns/.svn"
#define FILE_DIR "code/modules/computer"
#define FILE_DIR "code/modules/computer/.svn"
#define FILE_DIR "code/modules/door"
#define FILE_DIR "code/modules/door/.svn"
#define FILE_DIR "code/modules/gas"
#define FILE_DIR "code/modules/gas/.svn"
#define FILE_DIR "code/modules/genetic"
#define FILE_DIR "code/modules/genetic/.svn"
#define FILE_DIR "code/modules/hud"
#define FILE_DIR "code/modules/hud/.svn"
#define FILE_DIR "code/modules/login"
#define FILE_DIR "code/modules/login/.svn"
#define FILE_DIR "code/modules/medical"
#define FILE_DIR "code/modules/medical/.svn"
#define FILE_DIR "code/modules/mob"
#define FILE_DIR "code/modules/mob/.svn"
#define FILE_DIR "code/modules/mob/.svn/text-base"
#define FILE_DIR "code/modules/mob/dead"
#define FILE_DIR "code/modules/mob/dead/.svn"
#define FILE_DIR "code/modules/mob/dead/observer"
#define FILE_DIR "code/modules/mob/dead/observer/.svn"
#define FILE_DIR "code/modules/mob/dead/observer/.svn/text-base"
#define FILE_DIR "code/modules/mob/living"
#define FILE_DIR "code/modules/mob/living/.svn"
#define FILE_DIR "code/modules/mob/living/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon"
#define FILE_DIR "code/modules/mob/living/carbon/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon/alien"
#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon/beast"
#define FILE_DIR "code/modules/mob/living/carbon/beast/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/beast/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon/human"
#define FILE_DIR "code/modules/mob/living/carbon/human/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/human/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/carbon/monkey"
#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn"
#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/silicon"
#define FILE_DIR "code/modules/mob/living/silicon/.svn"
#define FILE_DIR "code/modules/mob/living/silicon/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/silicon/ai"
#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn"
#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/silicon/decoy"
#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn"
#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/silicon/hivebot"
#define FILE_DIR "code/modules/mob/living/silicon/hivebot/.svn"
#define FILE_DIR "code/modules/mob/living/silicon/hivebot/.svn/text-base"
#define FILE_DIR "code/modules/mob/living/silicon/robot"
#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn"
#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn/text-base"
#define FILE_DIR "code/modules/mob/new_player"
#define FILE_DIR "code/modules/mob/new_player/.svn"
#define FILE_DIR "code/modules/mob/new_player/.svn/text-base"
#define FILE_DIR "code/modules/power"
#define FILE_DIR "code/modules/power/.svn"
#define FILE_DIR "code/modules/power/.svn/text-base"
#define FILE_DIR "code/modules/power/antimatter"
#define FILE_DIR "code/modules/power/antimatter/.svn"
#define FILE_DIR "code/modules/power/antimatter/.svn/text-base"
#define FILE_DIR "code/modules/radio"
#define FILE_DIR "code/modules/radio/.svn"
#define FILE_DIR "code/modules/shuttle"
#define FILE_DIR "code/modules/shuttle/.svn"
#define FILE_DIR "code/unused"
#define FILE_DIR "code/unused/.svn"
#define FILE_DIR "code/unused/.svn/text-base"
#define FILE_DIR "code/unused/game"
#define FILE_DIR "code/unused/game/.svn"
#define FILE_DIR "code/unused/game/verbs"
#define FILE_DIR "code/unused/game/verbs/.svn"
#define FILE_DIR "code/unused/modules"
#define FILE_DIR "code/unused/modules/.svn"
#define FILE_DIR "code/unused/modules/admin"
#define FILE_DIR "code/unused/modules/admin/.svn"
#define FILE_DIR "code/WorkInProgress"
#define FILE_DIR "code/WorkInProgress/.svn"
#define FILE_DIR "code/WorkInProgress/.svn/text-base"
#define FILE_DIR "code/WorkInProgress/computer2"
#define FILE_DIR "code/WorkInProgress/computer2/.svn"
#define FILE_DIR "code/WorkInProgress/computer2/.svn/text-base"
#define FILE_DIR "code/WorkInProgress/optics"
#define FILE_DIR "code/WorkInProgress/optics/.svn"
#define FILE_DIR "code/WorkInProgress/optics/.svn/text-base"
#define FILE_DIR "code/WorkInProgress/pda2"
#define FILE_DIR "code/WorkInProgress/pda2/.svn"
#define FILE_DIR "code/WorkInProgress/pda2/.svn/text-base"
#define FILE_DIR "code/WorkInProgress/recycling"
#define FILE_DIR "code/WorkInProgress/recycling/.svn"
#define FILE_DIR "code/WorkInProgress/recycling/.svn/text-base"
#define FILE_DIR "config"
#define FILE_DIR "config/.svn"
#define FILE_DIR "config/.svn/text-base"
#define FILE_DIR "config/names"
#define FILE_DIR "config/names/.svn"
#define FILE_DIR "config/names/.svn/text-base"
#define FILE_DIR "data"
#define FILE_DIR "data/.svn"
#define FILE_DIR "data/.svn/text-base"
#define FILE_DIR "icons"
#define FILE_DIR "icons/.svn"
#define FILE_DIR "icons/.svn/prop-base"
#define FILE_DIR "icons/.svn/text-base"
#define FILE_DIR "icons/effects"
#define FILE_DIR "icons/effects/.svn"
#define FILE_DIR "icons/effects/.svn/prop-base"
#define FILE_DIR "icons/effects/.svn/text-base"
#define FILE_DIR "icons/misc"
#define FILE_DIR "icons/misc/.svn"
#define FILE_DIR "icons/misc/.svn/prop-base"
#define FILE_DIR "icons/misc/.svn/text-base"
#define FILE_DIR "icons/mob"
#define FILE_DIR "icons/mob/.svn"
#define FILE_DIR "icons/mob/.svn/prop-base"
#define FILE_DIR "icons/mob/.svn/text-base"
#define FILE_DIR "icons/obj"
#define FILE_DIR "icons/obj/.svn"
#define FILE_DIR "icons/obj/.svn/prop-base"
#define FILE_DIR "icons/obj/.svn/text-base"
#define FILE_DIR "icons/obj/atmospherics"
#define FILE_DIR "icons/obj/atmospherics/.svn"
#define FILE_DIR "icons/obj/atmospherics/.svn/prop-base"
#define FILE_DIR "icons/obj/atmospherics/.svn/text-base"
#define FILE_DIR "icons/obj/clothing"
#define FILE_DIR "icons/obj/clothing/.svn"
#define FILE_DIR "icons/obj/clothing/.svn/prop-base"
#define FILE_DIR "icons/obj/clothing/.svn/text-base"
#define FILE_DIR "icons/obj/doors"
#define FILE_DIR "icons/obj/doors/.svn"
#define FILE_DIR "icons/obj/doors/.svn/prop-base"
#define FILE_DIR "icons/obj/doors/.svn/text-base"
#define FILE_DIR "icons/obj/machines"
#define FILE_DIR "icons/obj/machines/.svn"
#define FILE_DIR "icons/obj/machines/.svn/prop-base"
#define FILE_DIR "icons/obj/machines/.svn/text-base"
#define FILE_DIR "icons/obj/pipes"
#define FILE_DIR "icons/obj/pipes/.svn"
#define FILE_DIR "icons/obj/pipes/.svn/prop-base"
#define FILE_DIR "icons/obj/pipes/.svn/text-base"
#define FILE_DIR "icons/pda_icons"
#define FILE_DIR "icons/pda_icons/.svn"
#define FILE_DIR "icons/pda_icons/.svn/prop-base"
#define FILE_DIR "icons/pda_icons/.svn/text-base"
#define FILE_DIR "icons/PSD files"
#define FILE_DIR "icons/PSD files/.svn"
#define FILE_DIR "icons/PSD files/.svn/prop-base"
#define FILE_DIR "icons/PSD files/.svn/text-base"
#define FILE_DIR "icons/Testing"
#define FILE_DIR "icons/Testing/.svn"
#define FILE_DIR "icons/Testing/.svn/prop-base"
#define FILE_DIR "icons/Testing/.svn/text-base"
#define FILE_DIR "icons/turf"
#define FILE_DIR "icons/turf/.svn"
#define FILE_DIR "icons/turf/.svn/prop-base"
#define FILE_DIR "icons/turf/.svn/text-base"
#define FILE_DIR "interface"
#define FILE_DIR "interface/.svn"
#define FILE_DIR "interface/.svn/text-base"
#define FILE_DIR "maps"
#define FILE_DIR "maps/.svn"
#define FILE_DIR "maps/.svn/prop-base"
#define FILE_DIR "maps/.svn/text-base"
#define FILE_DIR "maps/backup"
#define FILE_DIR "maps/backup/.svn"
#define FILE_DIR "maps/backup/.svn/text-base"
#define FILE_DIR "music"
#define FILE_DIR "music/.svn"
#define FILE_DIR "music/.svn/text-base"
#define FILE_DIR "sound"
#define FILE_DIR "sound/.svn"
#define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/ambience/.svn"
#define FILE_DIR "sound/ambience/.svn/prop-base"
#define FILE_DIR "sound/ambience/.svn/text-base"
#define FILE_DIR "sound/announcer"
#define FILE_DIR "sound/announcer/.svn"
#define FILE_DIR "sound/announcer/.svn/prop-base"
#define FILE_DIR "sound/announcer/.svn/text-base"
#define FILE_DIR "sound/effects"
#define FILE_DIR "sound/effects/.svn"
#define FILE_DIR "sound/effects/.svn/prop-base"
#define FILE_DIR "sound/effects/.svn/text-base"
#define FILE_DIR "sound/items"
#define FILE_DIR "sound/items/.svn"
#define FILE_DIR "sound/items/.svn/prop-base"
#define FILE_DIR "sound/items/.svn/text-base"
#define FILE_DIR "sound/machines"
#define FILE_DIR "sound/machines/.svn"
#define FILE_DIR "sound/machines/.svn/prop-base"
#define FILE_DIR "sound/machines/.svn/text-base"
#define FILE_DIR "sound/misc"
#define FILE_DIR "sound/misc/.svn"
#define FILE_DIR "sound/misc/.svn/prop-base"
#define FILE_DIR "sound/misc/.svn/text-base"
#define FILE_DIR "sound/piano"
#define FILE_DIR "sound/piano/.svn"
#define FILE_DIR "sound/piano/.svn/prop-base"
#define FILE_DIR "sound/piano/.svn/text-base"
#define FILE_DIR "sound/voice"
#define FILE_DIR "sound/voice/.svn"
#define FILE_DIR "sound/voice/.svn/prop-base"
#define FILE_DIR "sound/voice/.svn/text-base"
#define FILE_DIR "sound/weapons"
#define FILE_DIR "sound/weapons/.svn"
#define FILE_DIR "sound/weapons/.svn/prop-base"
#define FILE_DIR "sound/weapons/.svn/text-base"
#define FILE_DIR "SQL"
#define FILE_DIR "SQL/.svn"
#define FILE_DIR "SQL/.svn/text-base"
// END_FILE_DIR
// BEGIN_PREFERENCES
@@ -461,7 +130,6 @@
// BEGIN_INCLUDE
#include "code\names.dm"
#include "code\setup.dm"
#include "code\stylesheet.dm"
#include "code\ATMOSPHERICS\atmospherics.dm"
#include "code\ATMOSPHERICS\datum_pipe_network.dm"
#include "code\ATMOSPHERICS\datum_pipeline.dm"
@@ -523,6 +191,7 @@
#include "code\defines\mob\living\carbon\alien_larva.dm"
#include "code\defines\mob\living\carbon\carbon.dm"
#include "code\defines\mob\living\carbon\human.dm"
#include "code\defines\mob\living\carbon\metroid.dm"
#include "code\defines\mob\living\carbon\monkey.dm"
#include "code\defines\mob\living\silicon\ai.dm"
#include "code\defines\mob\living\silicon\decoy.dm"
@@ -596,6 +265,22 @@
#include "code\game\gamemodes\changeling\changeling_powers.dm"
#include "code\game\gamemodes\ctf\ctf.dm"
#include "code\game\gamemodes\ctf\ctf_items.dm"
#include "code\game\gamemodes\cultist\cultist.dm"
#include "code\game\gamemodes\cultist\rune1.dm"
#include "code\game\gamemodes\cultist\rune10.dm"
#include "code\game\gamemodes\cultist\rune11.dm"
#include "code\game\gamemodes\cultist\rune12.dm"
#include "code\game\gamemodes\cultist\rune13.dm"
#include "code\game\gamemodes\cultist\rune14.dm"
#include "code\game\gamemodes\cultist\rune2.dm"
#include "code\game\gamemodes\cultist\rune3.dm"
#include "code\game\gamemodes\cultist\rune4.dm"
#include "code\game\gamemodes\cultist\rune5.dm"
#include "code\game\gamemodes\cultist\rune6.dm"
#include "code\game\gamemodes\cultist\rune7.dm"
#include "code\game\gamemodes\cultist\rune8.dm"
#include "code\game\gamemodes\cultist\rune9.dm"
#include "code\game\gamemodes\cultist\runes.dm"
#include "code\game\gamemodes\deathmatch\deathmatch.dm"
#include "code\game\gamemodes\extended\extended.dm"
#include "code\game\gamemodes\malfunction\Malf_Modules.dm"
@@ -701,20 +386,6 @@
#include "code\game\magic\library.dm"
#include "code\game\magic\magicmonster.dm"
#include "code\game\magic\musician.dm"
#include "code\game\magic\cultist\ritual.dm"
#include "code\game\magic\cultist\rune1.dm"
#include "code\game\magic\cultist\rune10.dm"
#include "code\game\magic\cultist\rune11.dm"
#include "code\game\magic\cultist\rune12.dm"
#include "code\game\magic\cultist\rune13.dm"
#include "code\game\magic\cultist\rune2.dm"
#include "code\game\magic\cultist\rune3.dm"
#include "code\game\magic\cultist\rune4.dm"
#include "code\game\magic\cultist\rune5.dm"
#include "code\game\magic\cultist\rune6.dm"
#include "code\game\magic\cultist\rune7.dm"
#include "code\game\magic\cultist\rune8.dm"
#include "code\game\magic\cultist\rune9.dm"
#include "code\game\objects\assemblies.dm"
#include "code\game\objects\blood.dm"
#include "code\game\objects\bomb.dm"
@@ -839,6 +510,7 @@
#include "code\game\verbs\authorize.dm"
#include "code\game\verbs\checkkarma.dm"
#include "code\game\verbs\ooc.dm"
#include "code\game\verbs\sound.dm"
#include "code\game\verbs\suicide.dm"
#include "code\game\verbs\who.dm"
#include "code\modules\admin\admin.dm"

BIN
icons/mob/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 62 KiB

BIN
icons/mob/uniform_fat.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
icons/obj/food.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

9337
maps/trunkmap.dmm
View File

File diff suppressed because it is too large Load Diff