Fulp 2.1? (#186)

* wtf

* haha yeah :)

* dme

* Update fulp_logo.dm

fulp_modules/ZFulpcode/modules/jobs/inventories.dm

@@ -1,10 +0,0 @@
-/// Security (Original by Surrealistik) ///
-
-/datum/outfit/job/security
-	box = /obj/item/storage/box/survival/security/improved //their inventory should stay the same, save for the added crowbar
-	
-/datum/outfit/job/warden
-	box = /obj/item/storage/box/survival/security/improved
-
-/datum/outfit/job/hos
-	box = /obj/item/storage/box/survival/security/improved

fulp_modules/ZFulpcode/readme.MD

@@ -1,6 +0,0 @@
-# Code Overwrites
-
-## Description:
-
-Code Overwrites allow us to edit a TG File without directly interacting with it. Please use this to overwrite files, as to avoid conflicts.
-Bonus points if you document it and make it modular so we know where to find which overwrites.

fulp_modules/Z_edits/fulp_jobs/inventories.dm

@@ -0,0 +1,16 @@
+/*
+ *	# Security Crowbars
+ *
+ * 	Gives Security the improved box in their roundstart bag, one that includes a Crowbar.
+ *	Originally created by Surrealistik
+ */
+
+///Their inventories should stay the same, save for the added crowbar
+/datum/outfit/job/security
+	box = /obj/item/storage/box/survival/security/improved
+
+/datum/outfit/job/warden
+	box = /obj/item/storage/box/survival/security/improved
+
+/datum/outfit/job/hos
+	box = /obj/item/storage/box/survival/security/improved

fulp_modules/Z_edits/fulp_logo/fulp_logo.dm

@@ -0,0 +1,2 @@
+/obj/effect/turf_decal/plaque
+	icon = 'fulp_modules/Z_edits/fulp_logo/fulp_logo.dmi'

fulp_modules/Z_edits/huds/huds.dm

@@ -1,4 +1,8 @@
-/// Overwrites sec_hud_set_ID [code/games/data_huds.dm] to make fulp jobs get their HUD icons.
+/*
+ *	# Fulp Job HUDs
+ *
+ *	Overwrites sec_hud_set_ID [code/games/data_huds.dm] to make Fulp jobs use their own HUD icons.
+ */
 
 /mob/living/carbon/human/sec_hud_set_ID()
 	var/image/holder = hud_list[ID_HUD]

fulp_modules/edits/fulp_logo/fulp_logo.dm

@@ -1,2 +0,0 @@
-/obj/effect/turf_decal/plaque
-	icon = 'fulp_modules/edits/fulp_logo/fulp_logo.dmi'

tgstation.dme

@@ -3578,12 +3578,6 @@
 #include "code\modules\zombie\items.dm"
 #include "code\modules\zombie\organs.dm"
 #include "fulp_modules\global_vars.dm"
-#include "fulp_modules\edits\container_init\machine_init.dm"
-#include "fulp_modules\edits\cryopod_removal\cryopod.dm"
-#include "fulp_modules\edits\cult_edit\cult_edit.dm"
-#include "fulp_modules\edits\fulp_logo\fulp_logo.dm"
-#include "fulp_modules\edits\malfunction_bot\upstream_bot.dm"
-#include "fulp_modules\edits\nightmare_edit\nightmare.dm"
 #include "fulp_modules\features\barsigns\barsigns.dm"
 #include "fulp_modules\features\ert\code\advanced_equipment.dm"
 #include "fulp_modules\features\ert\code\antag_datum.dm"
@@ -3635,10 +3629,9 @@
 #include "fulp_modules\features\moth_customization\code\moth_wings.dm"
 #include "fulp_modules\features\science_budget\science_budget.dm"
 #include "fulp_modules\features\toys\code\toys.dm"
-#include "fulp_modules\fulp_configs\fulp_config.dm"
-#include "fulp_modules\fulp_configs\fulp_world.dm"
-#include "fulp_modules\fulp_configs\kiss_overwrite.dm"
 #include "fulp_modules\fulp_configs\code\ambience.dm"
+#include "fulp_modules\fulp_configs\code\fulp_config.dm"
+#include "fulp_modules\fulp_configs\code\fulp_world.dm"
 #include "fulp_modules\fulp_configs\code\sound.dm"
 #include "fulp_modules\main_features\beefmen\code\beefman_integration.dm"
 #include "fulp_modules\main_features\beefmen\code\modules\__DEFINES\beefman_defines.dm"
@@ -3703,8 +3696,15 @@
 #include "fulp_modules\maps\cytology_spawner\beefcyto.dm"
 #include "fulp_modules\maps\fulp_shuttles\fulp_shuttles.dm"
 #include "fulp_modules\maps\plaques\commission_plaques.dm"
-#include "fulp_modules\ZFulpcode\modules\jobs\huds.dm"
-#include "fulp_modules\ZFulpcode\modules\jobs\inventories.dm"
+#include "fulp_modules\Z_edits\container_init\machine_init.dm"
+#include "fulp_modules\Z_edits\cryopod_removal\cryopod.dm"
+#include "fulp_modules\Z_edits\cult_edit\cult.dm"
+#include "fulp_modules\Z_edits\fulp_jobs\inventories.dm"
+#include "fulp_modules\Z_edits\fulp_logo\fulp_logo.dm"
+#include "fulp_modules\Z_edits\huds\huds.dm"
+#include "fulp_modules\Z_edits\kiss_overwrite\kiss.dm"
+#include "fulp_modules\Z_edits\malfunction_bot\upstream_bot.dm"
+#include "fulp_modules\Z_edits\nightmare_edit\nightmare.dm"
 #include "interface\interface.dm"
 #include "interface\menu.dm"
 #include "interface\stylesheet.dm"