cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

Browse Source
This commit is contained in:
Aurorablade
2015-12-24 00:17:26 -05:00
parent 5d7aa0ae00 7449cde946
commit 1a70e9caf5
108 changed files with 1470 additions and 2232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+3
View File
@@ -1236,6 +1236,7 @@
ticker.mode.forge_traitor_objectives(src)
ticker.mode.finalize_traitor(src)
ticker.mode.greet_traitor(src)
ticker.mode.update_traitor_icons_added(src)
/datum/mind/proc/make_Nuke()
if(!(src in ticker.mode.syndicates))
@@ -1275,6 +1276,7 @@
special_role = "Changeling"
ticker.mode.forge_changeling_objectives(src)
ticker.mode.greet_changeling(src)
ticker.mode.update_change_icons_added(src)
/datum/mind/proc/make_Wizard()
if(!(src in ticker.mode.wizards))
@@ -1294,6 +1296,7 @@
ticker.mode.name_wizard(current)
ticker.mode.forge_wizard_objectives(src)
ticker.mode.greet_wizard(src)
ticker.mode.update_wiz_icons_added(src)
/datum/mind/proc/make_Cultist()
code/datums/supplypacks.dm
+2 -2
View File
@@ -482,8 +482,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/datum/supply_packs/engineering/engine/field_gen
name = "Field Generator Crate"
contains = list(/obj/machinery/field_generator,
/obj/machinery/field_generator)
contains = list(/obj/machinery/field/generator,
/obj/machinery/field/generator)
cost = 10
containername = "field generator crate"