mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Fixed bugs:
Players now cannot rejoin the game if their mobs were gibbed/burned while they were disconnected. Cremating/gibbing for meat now counts as death with triggering log records, gamemode checks, sql reports, etc. Fixed some bugs with enabling verb ghostize(). Fixed bug with DNA Machine popping out from the protolathe. Fixed bug with tuning RSD. Added juicer: berry -> berry juice banana -> banana juice tomato -> tomato juice carrot -> carrot juice Bug your botanists for getting better potence for more juice. Juicer can be pulled, chef can give it to barmen or botanists. Blender changed a bit: tomato -> ketchup corn -> corn oil soy beans -> soy milk any food -> nutriments and contained reagents. Sound for the juicer found at http://www.freesound.org/samplesViewSingle.php?id=98053, edited by Nikie. You can eject ingredients from the microwave. However, you cannot get back your reagents, they will be lost and can make microwave dirty. Essence of Banana was renamed to Banana Juice. Added Carrot Juice. Heals eyes much slower than imidazoline. Carrots now contain imidazoline (however, carrot cake contains more imidazoline). Potency for peppers, tomatoes, carrots and druggy mushrooms should work now. New cocktail "Bahama mama": 2 rum, 2 orangejuice, limejuice, ice. Changed recipe for soy sauce: 4 soy milk + 1 acid. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1477 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -19,9 +19,12 @@
|
||||
/*if(src.stat != 2) //this check causes nothing but troubles. Commented out for Nar-Sie's sake. --rastaf0
|
||||
src << "Only dead people and admins get to ghost, and admins don't use this verb to ghost while alive."
|
||||
return*/
|
||||
if(src.client)
|
||||
src.client.mob = new/mob/dead/observer(src)
|
||||
if(src.key)
|
||||
var/mob/dead/observer/ghost = new(src)
|
||||
ghost.key = src.key
|
||||
src.verbs -= /mob/proc/ghostize
|
||||
if (ghost.client)
|
||||
ghost.client.eye = ghost
|
||||
return
|
||||
|
||||
/mob/proc/adminghostize()
|
||||
|
||||
@@ -29,9 +29,9 @@
|
||||
// world << "Bomb has ignited?"
|
||||
A.part4.ignite()
|
||||
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(10)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
|
||||
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
log_game("Rebooting because of no live players")
|
||||
world.Reboot()
|
||||
return
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(50)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
return ..(gibbed)
|
||||
@@ -42,8 +42,7 @@
|
||||
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
|
||||
if(mind)
|
||||
mind.store_memory("Time of death: [tod]", 0)
|
||||
if(client)
|
||||
sql_report_death(src)
|
||||
sql_report_death(src)
|
||||
//src.icon_state = "dead"
|
||||
|
||||
ticker.mode.check_win()
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
log_game("Rebooting because of no live players")
|
||||
world.Reboot()
|
||||
return
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(50)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
|
||||
return ..(gibbed)
|
||||
@@ -255,8 +255,8 @@
|
||||
if (get_turf(M) in V) //this is slow, but I don't think we'd have a lot of wardrobewhores every round --rastaf0
|
||||
listening+=M
|
||||
else
|
||||
if (M.ghost_ears && !(M in listening))
|
||||
listening+=M
|
||||
if (M.client && M.client.ghost_ears)
|
||||
listening|=M
|
||||
|
||||
for (var/obj/O in ((V | src.contents)-used_radios)) //radio in pocket could work, radio in backpack wouldn't --rastaf0
|
||||
spawn (0)
|
||||
|
||||
@@ -44,8 +44,8 @@
|
||||
log_game("Rebooting because of no live players")
|
||||
world.Reboot()
|
||||
return
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(50)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
return ..(gibbed)
|
||||
@@ -17,8 +17,8 @@
|
||||
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
|
||||
store_memory("Time of death: [tod]", 0)
|
||||
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(50)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
return ..(gibbed)
|
||||
@@ -55,9 +55,9 @@
|
||||
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
|
||||
mind.store_memory("Time of death: [tod]", 0)
|
||||
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(50)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
return ..(gibbed)
|
||||
|
||||
|
||||
@@ -24,9 +24,7 @@
|
||||
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
|
||||
store_memory("Time of death: [tod]", 0)
|
||||
|
||||
if(mind)
|
||||
if(client)
|
||||
sql_report_cyborg_death(src)
|
||||
sql_report_cyborg_death(src)
|
||||
|
||||
for(var/mob/M in world)
|
||||
if ((M.client && !( M.stat )))
|
||||
@@ -38,8 +36,8 @@
|
||||
log_game("Rebooting because of no live players")
|
||||
world.Reboot()
|
||||
return
|
||||
if (src.client)
|
||||
if (src.key)
|
||||
spawn(50)
|
||||
if(src.client && src.stat == 2)
|
||||
if(src.key && src.stat == 2)
|
||||
src.verbs += /mob/proc/ghostize
|
||||
return ..(gibbed)
|
||||
@@ -1356,16 +1356,16 @@
|
||||
src << browse('changelog.html', "window=changes;size=675x650")
|
||||
src.client.changes = 1
|
||||
|
||||
/mob/var/ghost_ears = 1
|
||||
/mob/verb/toggle_ghost_ears()
|
||||
/client/var/ghost_ears = 1
|
||||
/client/verb/toggle_ghost_ears()
|
||||
set name = "Ghost ears"
|
||||
set category = "OOC"
|
||||
set desc = "Hear talks from everywhere"
|
||||
src.ghost_ears = !src.ghost_ears
|
||||
if (ghost_ears)
|
||||
usr << "Now you hear all speech in world"
|
||||
usr << "\blue Now you hear all speech in the world"
|
||||
else
|
||||
usr << "Now you hear speech only from nearest creatures."
|
||||
usr << "\blue Now you hear speech only from nearest creatures."
|
||||
|
||||
/mob/verb/observe()
|
||||
set name = "Observe"
|
||||
|
||||
Reference in New Issue
Block a user