Merge branch 'tweak--CQC-kick' of https://github.com/RamleyDude/Paradise

into tweak--CQC-kick
ss220-space · Aug 21, 2024 · a54cc7f · a54cc7f
2 parents 860e939 + 4305c29
commit a54cc7f
Show file tree

Hide file tree

Showing 76 changed files with 747 additions and 183 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,40 +7,40 @@ on:
   workflow_dispatch:
     inputs:
       ci_required:
-        description: "CI Suite is required"
+        description: 'CI Suite is required'
         type: boolean
         required: true
         default: true
       perform_deploy_main:
-        description: "Deploy Paradise Main/Secondary"
+        description: 'Deploy Paradise Main/Secondary'
         type: boolean
         required: true
         default: true
       perform_deploy_vega:
-        description: "Deploy Paradise Vega"
+        description: 'Deploy Paradise Vega'
         type: boolean
         required: true
         default: true
       perform_deploy_cleo:
-        description: "Deploy Paradise Cleo"
+        description: 'Deploy Paradise Cleo'
         type: boolean
         required: true
         default: true
       perform_deploy_prime:
-        description: "Deploy Paradise Prime"
+        description: 'Deploy Paradise Prime'
         type: boolean
         required: true
-        default: true
+        default: false
       perform_deploy_wl:
-        description: "Deploy Paradise WL"
+        description: 'Deploy Paradise WL'
         type: boolean
         required: true
-        default: true
+        default: false
       perform_deploy_tutorial:
-        description: "Deploy Paradise Tutorial"
+        description: 'Deploy Paradise Tutorial'
         type: boolean
         required: true
-        default: true
+        default: false
 
 jobs:
   check:
@@ -120,13 +120,13 @@ jobs:
         name: Create GitHub deployment
         id: deployment
         with:
-          token: "${{ github.token }}"
+          token: '${{ github.token }}'
           environment: ${{ matrix.environment }}
           environment-url: ${{ vars.ENVIRONMENT_URL }}
-          log-url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          log-url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
           ref: ${{ vars.BRANCH }}
           production-environment: true
-          initial-status: "in_progress"
+          initial-status: 'in_progress'
 
       - name: Update and Build Paradise Main
         if: matrix.environment == 'Main' && inputs.perform_deploy_main
@@ -228,22 +228,22 @@ jobs:
           success()
         uses: chrnorm/deployment-status@v2
         with:
-          token: "${{ github.token }}"
+          token: '${{ github.token }}'
           environment-url: ${{ steps.deployment.outputs.environment_url }}
-          log-url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          log-url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
-          state: "success"
+          state: 'success'
 
       - name: Update deployment status (failure)
         if: |
           failure()
         uses: chrnorm/deployment-status@v2
         with:
-          token: "${{ github.token }}"
+          token: '${{ github.token }}'
           environment-url: ${{ steps.deployment.outputs.environment_url }}
-          log-url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          log-url: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
-          state: "failure"
+          state: 'failure'
 
   delete-automatic-deployments:
     name: Delete Automatic Deployments

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
@@ -40843,6 +40843,14 @@
 /obj/item/radio/intercom{
 	pixel_y = 28
 	},
+/obj/item/storage/belt/utility,
+/obj/item/extinguisher,
+/obj/item/secbot_assembly{
+	created_name = "Officer Podsky";
+	desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это...";
+	name = "Обломки офицера Подски";
+	pixel_y = 21
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -74601,15 +74609,8 @@
 	},
 /area/engine/break_room)
 "mop" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/extinguisher,
-/obj/item/secbot_assembly{
-	created_name = "Officer Podsky";
-	desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это...";
-	name = "Обломки офицера Подски";
-	pixel_y = 21
-	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/closet/secure_closet/pilot_sniper,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -112808,6 +112809,10 @@
 	icon_state = "grimy"
 	},
 /area/crew_quarters/chief)
+"vgo" = (
+/obj/structure/closet/secure_closet/pilot_sniper,
+/turf/space,
+/area/space)
 "vgq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -129619,7 +129624,7 @@ aaq
 aaq
 aaq
 aaq
-aaq
+vgo
 aaq
 aaq
 aaq

diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
@@ -38482,10 +38482,7 @@
 /turf/simulated/floor/glass,
 /area/hallway/primary/central)
 "fYK" = (
-/obj/structure/table,
-/obj/item/clipboard,
-/obj/item/paper_bin,
-/obj/item/pen,
+/obj/structure/closet/secure_closet/pilot_sniper,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkred"
@@ -78645,6 +78642,8 @@
 /obj/machinery/newscaster/security_unit{
 	pixel_y = -32
 	},
+/obj/item/clipboard,
+/obj/item/paper_bin,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkred"
 	},

diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
@@ -5764,6 +5764,10 @@
 /obj/machinery/firealarm{
 	pixel_y = 24
 	},
+/obj/item/flashlight,
+/obj/item/radio{
+	pixel_y = 6
+	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "darkred"
@@ -36306,16 +36310,12 @@
 	},
 /area/medical/morgue)
 "gFj" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight,
-/obj/item/radio{
-	pixel_y = 6
-	},
 /obj/machinery/camera{
 	c_tag = "Brig Pilot Office";
 	dir = 1;
 	network = list("SS13","Security")
 	},
+/obj/structure/closet/secure_closet/pilot_sniper,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkred"

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -5136,15 +5136,11 @@
 /turf/simulated/floor/wood,
 /area/security/hos)
 "asd" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight,
-/obj/item/radio{
-	pixel_y = 6
-	},
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -24
 	},
+/obj/structure/closet/secure_closet/pilot_sniper,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -13419,6 +13415,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/item/flashlight,
+/obj/item/radio{
+	pixel_y = 6
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm
@@ -41175,6 +41175,14 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/item/storage/belt/utility,
+/obj/item/extinguisher,
+/obj/item/secbot_assembly{
+	created_name = "Officer Podsky";
+	desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это...";
+	name = "Обломки офицера Подски";
+	pixel_y = 21
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -47615,6 +47623,10 @@
 "fMt" = (
 /turf/simulated/wall/r_wall,
 /area/maintenance/starboardsolar)
+"fMu" = (
+/obj/structure/closet/secure_closet/pilot_sniper,
+/turf/space,
+/area/space)
 "fMD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -71209,15 +71221,8 @@
 	},
 /area/engine/break_room)
 "mop" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/extinguisher,
-/obj/item/secbot_assembly{
-	created_name = "Officer Podsky";
-	desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это...";
-	name = "Обломки офицера Подски";
-	pixel_y = 21
-	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/closet/secure_closet/pilot_sniper,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -123104,7 +123109,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+fMu
 aaa
 aaa
 aaa

diff --git a/_maps/map_files/event/Station/towerstation.dmm b/_maps/map_files/event/Station/towerstation.dmm
@@ -30132,15 +30132,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/table,
-/obj/item/storage/belt/utility,
-/obj/item/secbot_assembly{
-	created_name = "Officer Podsky";
-	desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это...";
-	name = "Обломки офицера Подски";
-	pixel_y = 14;
-	pixel_x = -5
-	},
+/obj/structure/closet/secure_closet/pilot_sniper,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkred"
@@ -30211,6 +30203,14 @@
 /obj/item/radio/intercom{
 	pixel_y = 24
 	},
+/obj/item/storage/belt/utility,
+/obj/item/secbot_assembly{
+	created_name = "Officer Podsky";
+	desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это...";
+	name = "Обломки офицера Подски";
+	pixel_y = 14;
+	pixel_x = -5
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkred"

diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
@@ -33,6 +33,7 @@
 ///////////////////////////////////////
 
 // Generic mutations:
+#define	FARVISION		"far_vision"
 #define	TK				"telekenesis"
 #define COLDRES			"cold_resistance"
 #define XRAY			"xray"

diff --git a/code/__HELPERS/atoms.dm b/code/__HELPERS/atoms.dm
@@ -1,10 +1,10 @@
 /// Returns the src and all recursive contents as a list.
-/atom/proc/get_all_contents()
+/atom/proc/get_all_contents(ignore_flags)
 	. = list(src)
 	var/idx = 0
 	while(idx < length(.))
 		var/atom/checked_atom = .[++idx]
-		if(checked_atom.flags)
+		if(checked_atom.flags & ignore_flags)
 			continue
 		. += checked_atom.contents
 
@@ -39,7 +39,7 @@
 	for(var/atom/movable/I in contents)
 		if(!is_type_in_list(I, GLOB.ungibbable_items_types))
 			if(length(I.contents))
-				I.drop_ungibbable_items(new_loc)
+				. += I.drop_ungibbable_items(new_loc)
 			continue
 
 		. += I

diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
@@ -6,6 +6,7 @@ GLOBAL_VAR_INIT(hulkblock, 0)
 GLOBAL_VAR_INIT(teleblock, 0)
 GLOBAL_VAR_INIT(fireblock, 0)
 GLOBAL_VAR_INIT(xrayblock, 0)
+GLOBAL_VAR_INIT(farvisionblock, 0)
 GLOBAL_VAR_INIT(clumsyblock, 0)
 GLOBAL_VAR_INIT(coughblock, 0)
 GLOBAL_VAR_INIT(glassesblock, 0)
@@ -74,5 +75,4 @@ GLOBAL_VAR_INIT(fakeblock2, 0)
 GLOBAL_VAR_INIT(fakeblock3, 0)
 GLOBAL_VAR_INIT(fakeblock4, 0)
 GLOBAL_VAR_INIT(fakeblock5, 0)
-GLOBAL_VAR_INIT(fakeblock6, 0)
 
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -143,3 +143,6 @@
 	visible_message("<span class='combat danger'>[attack_message]</span>",\
 		"<span class='combat userdanger'>[attack_message]</span>")
 	return 1
+
+/obj/item/attack_self_tk(mob/user)
+	attack_self(user)
diff --git a/code/datums/spells/devil_boons.dm b/code/datums/spells/devil_boons.dm
@@ -48,6 +48,8 @@
 			continue
 		C.client.view = input("Select view range:", "Range", 4) in ranges
 
+/obj/effect/proc_holder/spell/view_range/genetic
+	desc = "Allows you to choose how far you can see."
 
 /obj/effect/proc_holder/spell/summon_friend
 	name = "Summon Friend"