Removes ass jam

.github/keylabeler.yml

@@ -29,7 +29,6 @@ labelMappings:
     "[ENHANCEMENT]": feature
     "[FEATURE]": feature
     "[FEAT]": feature
-    "[ASS-JAM]": ass-jam
     "[BALANCE]": balance
     "[CLEANLINESS]": cleanliness
     "[CLEAN]": cleanliness

.github/update_changelog.py

@@ -129,7 +129,7 @@ def main():
 		print("No changelog provided.")
 		return
 
-	changelog_path = os.environ["ASS_CHANGELOG_PATH"] if any(label.name == 'ass-jam' for label in pr.labels) else os.environ["CHANGELOG_PATH"]
+	changelog_path = os.environ["CHANGELOG_PATH"]
 	status = update_changelog(repo, changelog_path, date_string, pr_data, "Changelog for #{} [skip ci]".format(pr.number))
 
 	if not status:

.github/workflows/automaton.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         map: ["COGMAP", "COGMAP2", "CLARION", "DESTINY", "DONUT3", "HORIZON", "OSHAN", "KONDARU", "ATLAS", "MANTA", "SPACE_PREFAB", "UNDERWATER_PREFAB", "FULL"]
-        compiletype: ["default", "ass"]
+        compiletype: ["default"]
     steps:
       - uses: actions/checkout@v2
 
@@ -47,11 +47,6 @@ jobs:
           echo "MANPATH=/home/runner/BYOND/byond/man:$MANPATH" >> $GITHUB_ENV
           touch +secret/__secret.dme
 
-      - name: Setup for assjam
-        if: "matrix.compiletype == 'ass'"
-        run: |
-          sed -i 's/BUILD_TIME_DAY 01/BUILD_TIME_DAY 13/' _std/__build.dm
-
       - name: Setup rust-g
         run: |
           tools/ci/install_rust_g.sh
@@ -89,7 +84,7 @@ jobs:
       fail-fast: false
       matrix:
         map: ["COGMAP", "COGMAP2", "CLARION", "DESTINY", "DONUT3", "HORIZON", "OSHAN", "KONDARU", "ATLAS", "MANTA", "SPACE_PREFAB", "UNDERWATER_PREFAB", "FULL"]
-        compiletype: ["default", "ass"]
+        compiletype: ["default"]
 
     steps:
       - uses: actions/checkout@v2
@@ -122,11 +117,6 @@ jobs:
           echo "MANPATH=/home/runner/BYOND/byond/man:$MANPATH" >> $GITHUB_ENV
           touch +secret/__secret.dme
 
-      - name: Setup for assjam
-        if: "matrix.compiletype == 'ass'"
-        run: |
-          sed -i 's/BUILD_TIME_DAY 01/BUILD_TIME_DAY 13/' _std/__build.dm
-
       - name: Setup rust-g
         run: |
           tools/ci/install_rust_g.sh

.github/workflows/beepsky.yml

@@ -100,46 +100,6 @@ jobs:
           name: DMB + RSC
           path: ${{github.workspace}}/artifacts
 
-
-  compile_ass:
-    name: "Compile for Ass Day"
-    runs-on: ubuntu-18.04
-    if: "!contains(github.event.head_commit.message, 'skip ci')"
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Dependencies
-        run: |
-          curl https://raw.githubusercontent.com/goonstation/goonstation/master/tools/ci/sources.list | sudo tee /etc/apt/sources.list
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt install libstdc++6:i386
-
-      - name: Cache BYOND
-        uses: actions/cache@v1
-        with:
-          path: ~/BYOND
-          key: ${{ runner.os }}-byond-${{ hashFiles('buildByond.conf')}}
-          restore-keys: ${{ runner.os }}-byond
-
-      # Ass Jam occurs on the 13th of the month.
-      - name: Setup BYOND
-        run: |
-          tools/ci/install_byond.sh
-          cd $GITHUB_WORKSPACE
-          printenv
-          echo "BYOND_SYSTEM=/home/runner/BYOND/byond" >> $GITHUB_ENV
-          echo "/home/runner/BYOND/byond/bin" >> $GITHUB_PATH
-          echo "LD_LIBRARY_PATH=/home/runner/BYOND/byond/bin:$LD_LIBRARY_PATH" >> $GITHUB_ENV
-          echo "MANPATH=/home/runner/BYOND/byond/man:$MANPATH" >> $GITHUB_ENV
-          touch +secret/__secret.dme
-          sed -i 's/BUILD_TIME_DAY 01/BUILD_TIME_DAY 13/' _std/__build.dm
-
-
-      - name: Compile
-        run: |
-          tools/ci/dm.sh -DTRAVISBUILDING -DTRAVIS_ASSJAM goonstation.dme
-
   compile_full:
     name: "Compile and Lint with Secret Submodule"
     runs-on: ubuntu-18.04

.github/workflows/update_changelog.yml

@@ -27,6 +27,5 @@ jobs:
         REPO: ${{ github.repository }}
         TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CHANGELOG_PATH: strings/changelog.txt
-        ASS_CHANGELOG_PATH: strings/ass_changelog.txt
         GIT_EMAIL: "65057909+robuddybot@users.noreply.github.com"
         GIT_NAME: "robuddybot"

_std/__build.dm

@@ -118,8 +118,6 @@ o+`        `-` ``..-:yooos-..----------..`
 //#define CANADADAY 1
 //#define FOOTBALL_MODE 1
 
-//#define ASS_JAM_ENABLED 1 // BUT YOU ALSO GOTTA SET BUILD_TIME_DAY TO 13 BELOW!!!
-
 
 var/global/vcs_revision = "1"
 var/global/vcs_author = "bob"
@@ -133,7 +131,7 @@ var/global/ci_dm_version_minor = "100"
 #define BUILD_TIME_FULL "2009-02-13 18:31:30"
 #define BUILD_TIME_YEAR 2053
 #define BUILD_TIME_MONTH 01
-#define BUILD_TIME_DAY 01 //SET ME TO 13 TO TEST YOUR ASS_JAM CONTENT!!
+#define BUILD_TIME_DAY 01
 #define BUILD_TIME_HOUR 18
 #define BUILD_TIME_MINUTE 31
 #define BUILD_TIME_SECOND 30

_std/__std.dme

@@ -99,7 +99,6 @@
 #include "macros\twitch_sbill.dm"
 #include "macros\vehicles.dm"
 #include "address.dm"
-#include "ass_jam.dm"
 #include "color.dm"
 #include "datum.dm"
 #include "machinery.dm"

_std/setup.dm

@@ -58,15 +58,6 @@
 
 #define LOOC_RANGE 8
 
-//Ass Jam! enables a bunch of wacky and not-good features. BUILD LOCALLY!!!
-#ifdef RP_MODE
-#define ASS_JAM 0
-#elif BUILD_TIME_DAY == 13 && defined(ASS_JAM_ENABLED)
-#define ASS_JAM 1
-#else
-#define ASS_JAM 0
-#endif
-
 // holiday toggles!
 
 #if (BUILD_TIME_MONTH == 10)
@@ -81,14 +72,6 @@
 
 #define FOOTBALL_MODE 1
 //#define RP_MODE
-//#define ASS_JAM_ENABLED 1 //you need to set BUILD_TIME_DAY to 13 manually in __build.dm
-
-//handles ass jam stuff
-#if ASS_JAM
-#ifndef TRAVIS_ASSJAM
-#warn Building with ASS_JAM features enabled. Toggle this by changing BUILD_TIME_DAY in __build.dm
-#endif
-#endif
 
 #ifdef Z_LOG_ENABLE
 var/ZLOG_START_TIME

code/WorkInProgress/warcrimes.dm

@@ -817,7 +817,7 @@ Urs' Hauntdog critter
 	on_pet(mob/user)
 		if (..())
 			return 1
-		if (prob(ASS_JAM?50:25))
+		if (prob(25))
 			var/turf/T = get_turf(src)
 			src.visible_message("[src] screams![prob(5) ? " ...uh?" : null]",\
 			"You screams!")

code/atom.dm

@@ -353,9 +353,6 @@
 	var/throw_speed = 2
 	var/throw_range = 7
 	var/throwforce = 1
-#if ASS_JAM //timestop var used for pausing thrown stuff midair
-	var/throwing_paused = FALSE
-#endif
 	var/soundproofing = 5
 	appearance_flags = LONG_GLIDE | PIXEL_SCALE
 	var/l_spd = 0

code/client.dm

@@ -454,10 +454,6 @@ var/global/list/vpn_ip_checks = list() //assoc list of ip = true or ip = false.
 			if (src.holder && rank_to_level(src.holder.rank) >= LEVEL_MOD) // No admin changelog for goat farts (Convair880).
 				admin_changes()
 #endif
-#if ASS_JAM
-				src.verbs += /client/proc/cmd_ass_day_rules
-				src.cmd_ass_day_rules()
-#endif
 
 			if (src.byond_version < 513 || src.byond_build < 1526)
 				if (alert(src, "Please update BYOND to the latest version! Would you like to be taken to the download page? Make sure to download the stable release.", "ALERT", "Yes", "No") == "Yes")

code/datums/abilities/ghost_observer.dm

@@ -155,9 +155,6 @@ var/global/datum/spooktober_ghost_handler/spooktober_GH = new()
 		// src.addAbility(/datum/targetable/ghost_observer/respawn_animal)	//moved to respawn_options menu
 		src.addAbility(/datum/targetable/ghost_observer/respawn_options)
 
-#if ASS_JAM
-		src.addAbility(/datum/targetable/ghost_observer/ass_day_arena)
-#endif
 #ifdef HALLOWEEN
 		src.addAbility(/datum/targetable/ghost_observer/spooktober_hud)
 

code/datums/antag_weighting.dm

@@ -15,11 +15,6 @@ var/global/datum/antagWeighter/antagWeighter
 		..()
 		src.debug = debugMode ? debugMode : 0
 
-		//All picks during ass day are random
-#if ASS_JAM
-			src.variance = 100
-#endif
-
 
 	proc/debugLog(msg)
 		out(world, msg)
@@ -331,11 +326,6 @@ var/global/datum/antagWeighter/antagWeighter
 			apiPlayers["players\[[count]]\[ckey]"] = ckey
 			count++
 
-		//Selections during ass day don't count for weighting (but we still want to record that sweet sweet data yo)
-#if ASS_JAM
-			apiPlayers["assday"] = 1
-#endif
-
 		if (src.debug)
 			src.debugLog("Players list sending to API: [json_encode(apiPlayers)]")
 

code/datums/changelog.dm

@@ -203,11 +203,6 @@ ATTENTION: The changelog has moved into its own file: strings/changelog.txt
     <li>Official Forums<br><strong><a target="_blank" href="https://forum.ss13.co/">https://forum.ss13.co</a></strong></li>
 </ul>"}
 
-#if ASS_JAM
-	html += "<a id='ass_changelog' href='#' style='color:#ffffff; text-align:center; display:block' onclick='$(\".nano\").nanoScroller({ scrollTo: $(\"#main_changelog\") });'>Jump to regular changelog</a>"
-	html += changelog_parse(file2text("strings/ass_changelog.txt"), "Ass Jam Changelog", " ass")
-	html += "<a id='main_changelog' href='#' style='color:#ffffff; text-align:center; display:block' onclick='$(\".nano\").nanoScroller({ scrollTo: $(\"#ass_changelog\") });'>Jump to ass jam changelog</a>"
-#endif
 	html += changelog_parse(file2text("strings/changelog.txt"), "Changelog")
 	html += {"
 <h3>GoonStation 13 Development Team</h3>

code/datums/commodity.dm

@@ -2166,28 +2166,6 @@
 	upperfluc = 100
 	lowerfluc = -20
 
-#if ASS_JAM
-/datum/commodity/screamshoes
-	comname = "scream shoes"
-	comtype = /obj/item/clothing/shoes/scream
-	desc = "AAAAAAAAAAAAAAAAAAAA!"
-	onmarket = 0
-	price = 50
-	baseprice = 100
-	upperfluc = 150
-	lowerfluc = -20
-
-/datum/commodity/fartflops
-	comname = "fart-flops"
-	comtype = /obj/item/clothing/shoes/fart
-	desc = "They fart when you walk."
-	onmarket = 0
-	price = 50
-	baseprice = 100
-	upperfluc = 150
-	lowerfluc = -20
-#endif
-
 /// pathology
 /datum/commodity/synthmodule
 	comname = "Synth-O-Matic module"

code/datums/controllers/throwing_controls.dm

@@ -70,10 +70,6 @@ var/global/datum/controller/throwing/throwing_controller = new
 	for(var/_thr in thrown)
 		var/datum/thrown_thing/thr = _thr
 		var/atom/movable/thing = thr.thing
-#if ASS_JAM
-		if(thing?.throwing_paused)//timestop effect
-			continue
-#endif
 		var/end_throwing = FALSE
 		var/int_speed = round(thr.speed + thr.speed_error)
 		thr.speed_error += thr.speed - int_speed

code/datums/gamemodes/nuclear.dm

@@ -11,11 +11,7 @@
 	var/agent_radiofreq = 0 //:h for syndies, randomized per round
 	var/obj/machinery/nuclearbomb/the_bomb = null
 	var/bomb_check_timestamp = 0 // See check_finished().
-#if ASS_JAM
-	var/const/agents_possible = 30 // on ass jam theres up to 30 nukies to compensate for the warcrime of the kinetitech
-#else
 	var/const/agents_possible = 8 //If we ever need more syndicate agents. cogwerks - raised from 5
-#endif
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
@@ -109,24 +105,6 @@
 		message_admins("<span class='alert'><b>CRITICAL BUG:</b> nuke mode setup encountered an error while trying to choose a target location for the bomb and the target has defaulted to anywhere on the station! The round will be able to be played like this but it will be unbalanced! Please inform a coder!")
 		logTheThing("debug", null, null, "<b>CRITICAL BUG:</b> nuke mode setup encountered an error while trying to choose a target location for the bomb and the target has defaulted to anywhere on the station.")
 
-#if ASS_JAM
-	var/station_only = prob(40)
-	target_locations = list()
-	for(var/area/A in world)
-		var/has_turfs = 0
-		for (var/turf/T in A)
-			has_turfs = 1
-			break
-		if(!has_turfs)
-			break
-		if(station_only && !istype(A, /area/station))
-			continue
-		if(!(A.name in target_locations))
-			target_locations[A.name] = list(A.type)
-		else
-			target_locations[A.name].Add(A.type)
-#endif
-
 	target_location_name = pick(target_locations)
 	if (!target_location_name)
 		boutput(world, "<span class='alert'><b>ERROR: couldn't assign target location for bomb, aborting nuke round pre-setup.</b></span>")

code/datums/gameticker.dm

@@ -59,12 +59,6 @@ var/global/current_state = GAME_STATE_WORLD_INIT
 	pregame_timeleft = 1
 	#endif
 
-	#if ASS_JAM
-	SPAWN_DBG(10 SECONDS) // wait for people to login etc.
-		vote_manager.active_vote = new/datum/vote_new/mode("everyone-is-a-traitor")
-		boutput(world, "<B>ASS JAM: Everyone-Is-A-Traitor Mode vote has been started: [newVoteLinkStat.chat_link()] (120 seconds remaining)<br>(or click on the Status map as you do for map votes)</B>")
-	#endif
-
 	var/did_mapvote = 0
 	var/obj/overlay/zamujasa/round_start_countdown/timer/title_countdown = new()
 	while (current_state <= GAME_STATE_PREGAME)
@@ -165,7 +159,7 @@ var/global/current_state = GAME_STATE_WORLD_INIT
 	ooc_allowed = 0
 	boutput(world, "<B>OOC has been automatically disabled until the round ends.</B>")
 #else
-	if (ASS_JAM || istype(src.mode, /datum/game_mode/construction))
+	if (istype(src.mode, /datum/game_mode/construction))
 		looc_allowed = 1
 		boutput(world, "<B>LOOC has been automatically enabled.</B>")
 	else
@@ -690,10 +684,6 @@ var/global/current_state = GAME_STATE_WORLD_INIT
 					earnings += 100; // ALL CREW OBJECTIVE SBUX BONUS
 					bank_earnings.all_objs = 100
 
-#if ASS_JAM
-				earnings *= 2
-#endif
-
 			//pilot's bonus check and reward
 			var/pilot_bonus = 500 //for receipt
 			if(!isdead(player) && in_centcom(player))