Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add: new bitrun outfits and bigfix - mmg dupe fix,civ akm fix, pcv climat control fix, add mesa to config as gateway + unlimited event spawner #39

Merged
merged 5 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions code/modules/bitrunning/bitrunoutfits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/datum/outfit/bitrunning/
name = "bitrunning monitor"
uniform = /obj/item/clothing/under/rank/cargo/bitrunner
shoes = /obj/item/clothing/shoes/sneakers/black
belt = /obj/item/bitrunning_host_monitor
id = /obj/item/card/id/advanced

/datum/outfit/bitrunning/cop
name = "alcoholic cop"
neck = /obj/item/clothing/neck/tie/horrible
uniform = /obj/item/clothing/under/rank/security/detective/disco
shoes = /obj/item/clothing/shoes/discoshoes
suit = /obj/item/clothing/suit/discoblazer
id = /obj/item/card/id/advanced

/datum/outfit/bitrunning/kim
name = "Kimball"
glasses = /obj/item/clothing/glasses/regular/kim
uniform = /obj/item/clothing/under/rank/security/detective/kim
shoes = /obj/item/clothing/shoes/kim
suit = /obj/item/clothing/suit/kimjacket
id = /obj/item/card/id/advanced

/datum/outfit/bitrunning/mail
name = "Mailman"
head = /obj/item/clothing/head/costume/mailman
uniform = /obj/item/clothing/under/misc/mailman
shoes = /obj/item/clothing/shoes/sneakers/black
id = /obj/item/card/id/advanced
1 change: 1 addition & 0 deletions code/modules/bitrunning/objects/netpod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@

if(!length(cached_outfits))
cached_outfits += make_outfit_collection("Jobs", subtypesof(/datum/outfit/job))
cached_outfits += make_outfit_collection("Addon", subtypesof(/datum/outfit/bitrunning))

data["collections"] = cached_outfits

Expand Down
1 change: 1 addition & 0 deletions config/awaymissionconfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
#_maps/RandomZLevels/research.dmm
#_maps/RandomZLevels/SnowCabin.dmm
#_maps/RandomZLevels/museum.dmm
#_maps/RandomZLevels/blackmesa.dmm
9 changes: 5 additions & 4 deletions modular_nova/modules/events/code/event_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
var/flavor_text = ""
var/list/additional_equipment
var/disappear_after_spawn

var/infinite = TRUE
var/used = FALSE

/obj/character_event_spawner/attack_ghost(mob/user)
Expand Down Expand Up @@ -78,9 +78,10 @@
if(!user || !user.client)
return
message_admins("[ADMIN_LOOKUPFLW(user)] spawned as a [job_name] by using a spawner.")
used = TRUE
icon_state = "cryopod-open"
name = "opened cryogenic sleeper"
if(!infinite)
used = TRUE
icon_state = "cryopod-open"
name = "opened cryogenic sleeper"
//Spawn and copify prefs
var/mob/living/carbon/human/H = new(src)
user.client.prefs.safe_transfer_prefs_to(H)
Expand Down
9 changes: 8 additions & 1 deletion modular_nova/modules/events/code/event_spawner_menu.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
var/list/additional_equipment = list()
var/disappear_after_spawn = FALSE
var/prompt_players = FALSE

var/infinite = FALSE
var/show_outfit_equipment = FALSE

/datum/event_spawner_instance/New(_id, template_id)
Expand All @@ -35,6 +35,7 @@
CES.gets_loadout = gets_loadout
CES.headset_override = headset_override
CES.flavor_text = flavor_text
CES.infinite = infinite
CES.disappear_after_spawn = disappear_after_spawn
CES.name = "[job_name] cryogenic sleeper"
if(prompt_players)
Expand All @@ -58,6 +59,7 @@
blocks["gender_whitelist"] = gender_whitelist.Copy()
blocks["ckey_whitelist"] = ckey_whitelist.Copy()
blocks["disappear_after_spawn"] = disappear_after_spawn
blocks["infinite"] = infinite
blocks["prompt_players"] = prompt_players
return json_encode(blocks)

Expand All @@ -77,6 +79,7 @@
species_whitelist = blocks["species_whitelist"]
gender_whitelist = blocks["gender_whitelist"]
ckey_whitelist = blocks["ckey_whitelist"]
infinite = blocks["infinite"]
disappear_after_spawn = blocks["disappear_after_spawn"]
prompt_players = blocks["prompt_players"]

Expand Down Expand Up @@ -206,6 +209,7 @@
dat += "<a href='?src=[REF(src)];inst_pref=remove_ckey;id=[ESI.id];ckey=[ckey]'>[ckey]</a>"
dat += " <- <a href='?src=[REF(src)];inst_pref=add_ckey;id=[ESI.id]'>Add</a>"
dat += "<BR><font color='#777777'><i>If no ckeys are in the list, then any ckey can join as this role.</i></font>"
dat += "<BR>Spawner can spawn infinite peoples: <a href='?src=[REF(src)];inst_pref=infinite;id=[ESI.id]'>[ESI.infinite ? "Yes" : "No"]</a>"
dat += "<BR>Spawner disappears after spawn: <a href='?src=[REF(src)];inst_pref=disappear_after_spawn;id=[ESI.id]'>[ESI.disappear_after_spawn ? "Yes" : "No"]</a>"
dat += "<BR>Prompt players when spawner created: <a href='?src=[REF(src)];inst_pref=prompt_players;id=[ESI.id]'>[ESI.prompt_players ? "Yes" : "No"]</a> <font color='#777777'><i>This will only prompt ckeys which can access the spawner.</i></font>"
dat += "<HR><center><a href='?src=[REF(src)];inst_pref=make_spawner;id=[ESI.id]'>Create spawner on current location</a></center>"
Expand Down Expand Up @@ -260,6 +264,8 @@
ESI.show_outfit_equipment = !ESI.show_outfit_equipment
if("loadout")
ESI.gets_loadout = !ESI.gets_loadout
if("infinite")
ESI.infinite = !ESI.infinite
if("disappear_after_spawn")
ESI.disappear_after_spawn = !ESI.disappear_after_spawn
if("prompt_players")
Expand Down Expand Up @@ -360,6 +366,7 @@
ESI2.gets_loadout = ESI.gets_loadout
ESI2.headset_override = ESI.headset_override
ESI2.flavor_text = ESI.flavor_text
ESI2.infinite = ESI.infinite
ESI2.disappear_after_spawn = ESI.disappear_after_spawn
ESI2.prompt_players = ESI.prompt_players

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@
return TRUE
used_wrench.play_tool_sound(user)
balloon_alert_to_viewers("undeploying...")
if(!do_after(user, undeploy_time))
return TRUE
var/obj/undeployed_object = new undeployed_type(src)
//Keeps the health the same even if you redeploy the gun
undeployed_object.modify_max_integrity(max_integrity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@
flags_inv = null
allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
cell = /obj/item/stock_parts/power_store/cell/super
actions_types = list(/datum/action/item_action/hev_toggle, /datum/action/item_action/hev_toggle_notifs)
actions_types = list(/datum/action/item_action/hev_toggle, /datum/action/item_action/hev_toggle_notifs, /datum/action/item_action/toggle_spacesuit)
resistance_flags = FIRE_PROOF|ACID_PROOF|FREEZE_PROOF
clothing_flags = SNUG_FIT
show_hud = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
desc = "A 5.6x40mm civilian-grade surplus bullet casing."
special_desc = "CIVILIAN: Non-military ammunition with a low powder load. Performs worse in every aspect in comparison to its military variant."
projectile_type = /obj/projectile/bullet/a762x39/civilian
caliber = "a762x39civ"

/obj/projectile/bullet/a762x39/civilian
name = "5.6mm civilian bullet"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
icon_state = "akm_civ"
max_ammo = 15
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian
caliber = "a762x39civ"

/obj/item/gun/ballistic/automatic/akm/modern
name = "\improper Bubba's Krinkov"
Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3579,6 +3579,7 @@
#include "code\modules\bitrunning\abilities.dm"
#include "code\modules\bitrunning\alerts.dm"
#include "code\modules\bitrunning\areas.dm"
#include "code\modules\bitrunning\bitrunoutfits.dm"
#include "code\modules\bitrunning\designs.dm"
#include "code\modules\bitrunning\event.dm"
#include "code\modules\bitrunning\job.dm"
Expand Down
Loading