cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #708 from SkyMarshal/Airlocks

Browse Source 
Fixed give bug, announcement bug, old reaching method, chemicals can now react in mobs, added a light repairing portable-autolathe for janitor.
This commit is contained in:
CIB
2012-03-20 06:15:11 -07:00
parent 99ca245c50 371ade0832
commit d09ed22439
10 changed files with 60 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/give.dm
+4 -4
View File
@@ -46,9 +46,9 @@ mob/living/carbon/verb/give()
I.layer = 20
I.add_fingerprint(src)
src.update_clothing()
src.visible_message(src,"[usr.name] handed \the [I.name] to [src.name].")
src.visible_message("[usr.name] handed \the [I.name] to [src.name].")
if("No")
src.visible_message(src,"[usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
src.visible_message("[usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
else if(src.l_hand == null)
switch(alert(src,"[src.name] wants to give you \a [I.name]?",,"Yes","No"))
if("Yes")
@@ -75,8 +75,8 @@ mob/living/carbon/verb/give()
I.layer = 20
I.add_fingerprint(src)
src.update_clothing()
src.visible_message(src,"[usr.name] handed \the [I.name] to [src.name].")
src.visible_message("[usr.name] handed \the [I.name] to [src.name].")
if("No")
src.visible_message(src,"[usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
src.visible_message("[usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
else
usr << "[src.name]\s hands are full."
code/modules/mob/screen.dm
+1 -1
View File
@@ -421,7 +421,7 @@
usr.sleeping = 1
usr.sleeping_willingly = 1
if("rest")
usr.resting = !( usr.resting )
usr.resting = !usr.resting
if("throw")
if (!usr.stat && isturf(usr.loc) && !usr.restrained())
usr:toggle_throw_mode()