cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	code/modules/client/preferences.dm
This commit is contained in:
DJSnapshot
2014-07-25 17:19:59 -07:00
parent a4fc2b04a2 f33e11383b
commit de282a4e2a
12 changed files with 71 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/gamemodes/events/ninja_equipment.dm
View File

@@ -1377,19 +1377,17 @@ It is possible to destroy the net by the occupant or someone else.
playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
else
M.loc = null
M << "\red You appear in a strange place!"
M << "\red You appear in a strange place!"
for(var/mob/O in viewers(src, 3))
O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2)
for(var/mob/O in viewers(src, 3))
O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2)
if(!isnull(master))//As long as they still exist.
master << "\blue <b>SUCCESS</b>: \black transport procedure of \the [affecting] complete."
if(!isnull(master))//As long as they still exist.
master << "\blue <b>SUCCESS</b>: \black transport procedure of \the [affecting] complete."
M.captured = 0 //Important.
M.anchored = initial(M.anchored) //Changes the mob's anchored status to the original one; this is not handled by the can_move proc.
M.captured = 0 //Important.
M.anchored = initial(M.anchored) //Changes the mob's anchored status to the original one; this is not handled by the can_move proc.
else//And they are free.
M << "\blue You are free of the net!"

2
code/game/gamemodes/events/space_ninja.dm
View File

@@ -682,7 +682,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjablade
verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
//verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
//=======//KAMIKAZE VERBS//=======//

4
code/game/machinery/telecomms/logbrowser.dm
View File

@@ -73,7 +73,9 @@
var/mob/M = new mobtype
if(ishuman(M) || isbrain(M))
race = "Human"
var/mob/living/carbon/human/H = M
race = "[H.species.name]"
else if(ismonkey(M))
race = "Monkey"