cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Staff of Change victims now have Universal Speak (the metroids/xenos/monkeys can all speak english).

Browse Source 
Fixed a missing tile on the salvage shuttle.

Reverted it back to cultists getting one random word each because I broke something apparently.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2763 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
kortgstation@gmail.com
2011-12-21 19:59:49 +00:00
parent 54fae4a34f
commit cd7e1cd2b0
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult.dm
+4 -4
View File
@@ -141,7 +141,7 @@
/datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word)
/*if(!wordtravel)
if(!wordtravel)
runerandom()
if (!word)
word=pick(allwords)
@@ -170,9 +170,9 @@
// if("free")
// wordexp = "[wordfree] is free..."
if("hide")
wordexp = "[wordhide] is hide..."*/
cult_mob << "\red You remember the basics from the dark teachings of your master... [wordblood] is blood,[wordjoin] is join, and [wordself] is self..."
cult_mob.mind.store_memory("<B>You remember that</B> [wordblood] is blood,[wordjoin] is join, and [wordself] is self", 0, 0)
wordexp = "[wordhide] is hide..."
cult_mob << "\red You remember one thing from the dark teachings of your master... [wordexp]"
cult_mob.mind.store_memory("<B>You remember that</B> [wordexp]", 0, 0)
/datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE
code/modules/projectiles/projectile/change.dm
+4
View File
@@ -41,6 +41,7 @@
if(M.mind)
M.mind.transfer_to(O)
O.a_intent = "hurt"
O.universal_speak = 1
O << "<B>You are now a monkey.</B>"
del(M)
return O
@@ -111,6 +112,7 @@
new_metroid.a_intent = "hurt"
new_metroid << "<B>You are now an adult Metroid.</B>"
new_metroid.universal_speak = 1
del(M)
return new_metroid
else
@@ -120,6 +122,7 @@
if(M.mind)
M.mind.transfer_to(new_metroid)
new_metroid.a_intent = "hurt"
new_metroid.universal_speak = 1
new_metroid << "<B>You are now a baby Metroid.</B>"
del(M)
return new_metroid
@@ -145,6 +148,7 @@
if(M.mind)
M.mind.transfer_to(new_xeno)
new_xeno.a_intent = "hurt"
new_xeno.universal_speak = 1
new_xeno << "<B>You are now an alien.</B>"
del(M)
return new_xeno
maps/tgstation.2.0.8.dmm
+1 -1
View File
@@ -5666,7 +5666,7 @@
"ceX" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (EAST)"; icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/centcom/evac)
"ceY" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion (WEST)"; icon_state = "propulsion"; dir = 8},/turf/space,/area/centcom/evac)
"ceZ" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor,/area/centcom/evac)
"cfa" = (/obj/machinery/door/airlock/glass{name = "Salvage Shuttle Bridge"; req_access_txt = "19"},/turf/space,/area/centcom/evac)
"cfa" = (/obj/machinery/door/airlock/glass{name = "Salvage Shuttle Bridge"; req_access_txt = "19"},/turf/simulated/shuttle/floor,/area/centcom/evac)
"cfb" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; product_amounts = "5;5;6;3"; req_access_txt = "0"},/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/centcom/evac)
"cfc" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_l (WEST)"; icon_state = "burst_l"; dir = 8},/turf/space,/area/centcom/evac)
"cfd" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s5"; icon_state = "swall_s5"; dir = 2},/area/centcom/evac)