Writings on the back:[P.scribble]" : ]"\ + + "", "window=book;size=200x[P.scribble ? 400 : 200]") onclose(usr, "[P.name]") if (ismob(src.loc)) var/mob/M = src.loc @@ -733,7 +772,7 @@ NOTEBOOK /obj/item/weapon/clipboard/attackby(obj/item/weapon/P as obj, mob/user as mob) ..() - if (istype(P, /obj/item/weapon/paper)) + if (istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo)) if (src.contents.len < 15) user.drop_item() P.loc = src diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 217a4b9f93..0b88d78a53 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -75,7 +75,12 @@ H.apply_effect(10, STUTTER, 0) user.lastattacked = M H.lastattacker = user - charges-- + if(isrobot(src.loc)) + var/mob/living/silicon/robot/R = src.loc + if(R && R.cell) + R.cell.use(50) + else + charges-- H.visible_message("[M] has been stunned with the [src] by [user]!") playsound(src.loc, 'Egloves.ogg', 50, 1, -1) if(charges < 1) diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm index 76d63e9d33..d21d25886b 100644 --- a/code/game/objects/stacks/glass.dm +++ b/code/game/objects/stacks/glass.dm @@ -262,6 +262,8 @@ SHARDS playsound(src.loc, 'glass_step.ogg', 50, 1) if(ishuman(M)) var/mob/living/carbon/human/H = M + if(H.mutantrace == "lizard") //Soghun have... Scales? Yeah that works + return if(!((H.shoes) || (H.wear_suit && H.wear_suit.body_parts_covered & FEET))) var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) if(affecting.status & ROBOT) diff --git a/code/game/objects/storage/briefcase.dm b/code/game/objects/storage/briefcase.dm index 6413a66eec..7c81e92041 100644 --- a/code/game/objects/storage/briefcase.dm +++ b/code/game/objects/storage/briefcase.dm @@ -1,12 +1,5 @@ /obj/item/weapon/storage/briefcase/New() ..() - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/pen(src) /obj/item/weapon/storage/briefcase/attack(mob/M as mob, mob/living/user as mob) //..() diff --git a/code/game/objects/uplinks.dm b/code/game/objects/uplinks.dm index b9aa1276c5..3c138a527a 100644 --- a/code/game/objects/uplinks.dm +++ b/code/game/objects/uplinks.dm @@ -145,7 +145,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid randomItems.Add("/obj/item/weapon/soap/syndie") //Syndicate Soap randomItems.Add("/obj/item/weapon/storage/toolbox/syndicate") //Syndicate Toolbox - if(!randomItems) + if(!randomItems.len) del(randomItems) return 0 else diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm index 38b8c5ea47..1a0d1e09a3 100644 --- a/code/game/objects/watercloset.dm +++ b/code/game/objects/watercloset.dm @@ -58,7 +58,10 @@ var/obj/item/weapon/grab/G = I var/mob/GM = G.affecting if(ismob(G.affecting)) - if(G.state>1 && GM.loc == get_turf(src)) + if(G.state>1) + if(!GM.loc == get_turf(src)) + user << "[GM.name] needs to be on the toilet." + return if(open && !swirlie) user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") swirlie = GM @@ -101,7 +104,10 @@ var/obj/item/weapon/grab/G = I var/mob/GM = G.affecting if(ismob(G.affecting)) - if(G.state>1 && GM.loc == get_turf(src)) + if(G.state>1) + if(!GM.loc == get_turf(src)) + user << "[GM.name] needs to be on the urinal." + return user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") GM.adjustBruteLoss(8) else diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 54befddcbc..08470a9a2e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -266,7 +266,8 @@ proc/move_mining_shuttle() /*****************************Shovel********************************/ /obj/item/weapon/shovel - name = "Shovel" + name = "shovel" + desc = "A large tool for digging and moving dirt." icon = 'items.dmi' icon_state = "shovel" flags = FPRINT | TABLEPASS| CONDUCT @@ -278,11 +279,14 @@ proc/move_mining_shuttle() m_amt = 50 origin_tech = "materials=1;engineering=1" - - - - - +/obj/item/weapon/shovel/spade + name = "spade" + desc = "A small tool for digging and moving dirt." + icon_state = "spade" + item_state = "spade" + force = 5.0 + throwforce = 7.0 + w_class = 2.0 /**********************Mining car (Crate like thing, not the rail car)**************************/ diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 78ec74c0d3..2478ce7243 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -132,6 +132,8 @@ datum/preferences // OOC Metadata: var/metadata = "" + var/sound_adminhelp = 0 + New() hair_style = new/datum/sprite_accessory/hair/short @@ -265,9 +267,13 @@ datum/preferences if(config.allow_Metadata) dat += "OOC Notes: Edit
" - if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5)) - dat += "
OOC
" - dat += "Change colour
| __ |
Adminhelp sound: " + dat += "[(sound_adminhelp)?"On":"Off"] toggle" + + if(user.client.holder.level >= 5) + dat += "
OOC
" + dat += "Change color
| __ |
Occupation Choices
" dat += "\tSet Preferences
" @@ -906,6 +912,9 @@ datum/preferences if(ooccolor) src.ooccolor = ooccolor + if(link_tags["toggleadminhelpsound"]) + src.sound_adminhelp = !src.sound_adminhelp + if(link_tags["f_style"]) if(species != "Human") //Non-humans don't have hair stuff yet. return @@ -1268,6 +1277,7 @@ datum/preferences proc/setup_client(var/client/C) if(C) + C.sound_adminhelp = src.sound_adminhelp C.midis = src.midis C.ooccolor = src.ooccolor C.be_alien = be_special & BE_ALIEN diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm index 981e84658d..3dde385937 100644 --- a/code/modules/mob/new_player/savefile.dm +++ b/code/modules/mob/new_player/savefile.dm @@ -161,6 +161,8 @@ datum/preferences/proc/savefile_save(mob/user, slot) F["OOC_Notes"] << src.metadata + F["sound_adminhelp"] << src.sound_adminhelp + return 1 // loads the savefile corresponding to the mob's ckey @@ -269,6 +271,8 @@ datum/preferences/proc/savefile_load(mob/user, slot) F["OOC_Notes"] >> src.metadata + F["sound_adminhelp"] >> src.sound_adminhelp + if(isnull(metadata)) metadata = "" diff --git a/html/changelog.html b/html/changelog.html index ce5b79ed33..ae1f9dfdef 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,14 +57,23 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> -
+
-
+
Fixes medical items. Gauze/kits/ointment can now be applied correctly again.
+
29 June 2012
Erthilo updated:
- Raises job limits for Botanists, Atmospheric Technicnians, Roboticists, Chemists, and Geneticists.
+
28 June 2012
+Chinsky updated:
+-
+
- 'Rename' function for clipboards +
- Can add photos to clipboards +
- Fixed troubles with formatting when reading from clipboard (linebreaks not being properly placed) +
- Fixed photocopiers not copying photos properly +
27 June 2012
Erthilo updated:
@@ -82,6 +91,14 @@ should be listed in the changelog upon commit though. Thanks. -->
+
26 June 2012
+TG updated:
+-
+
- Fixed silicon mobs not being able to access newscaster. +
- Fixed harmbatons on everything other than harm, now it is the opposite way round. +