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: 1984rat update #44

Closed
wants to merge 16 commits into from
Closed
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
133 changes: 117 additions & 16 deletions _maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm

Large diffs are not rendered by default.

159 changes: 33 additions & 126 deletions _maps/RandomZLevels/blackmesa.dmm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions code/__DEFINES/~nova_defines/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#define FREQ_INTERDYNE 1209

#define RADIO_CHANNEL_GUILD "Guild"
#define RADIO_KEY_GUILD "p"
#define RADIO_TOKEN_GUILD ":p"
#define RADIO_KEY_GUILD "i"
#define RADIO_TOKEN_GUILD ":i"

#define FREQ_GUILD 1214

Expand Down
4 changes: 4 additions & 0 deletions code/modules/bitrunning/bitrunoutfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
shoes = /obj/item/clothing/shoes/sneakers/black
belt = /obj/item/bitrunning_host_monitor
id = /obj/item/card/id/advanced
back = /obj/item/storage/backpack

/datum/outfit/bitrunning/cop
name = "alcoholic cop"
Expand All @@ -12,6 +13,7 @@
shoes = /obj/item/clothing/shoes/discoshoes
suit = /obj/item/clothing/suit/discoblazer
id = /obj/item/card/id/advanced
back = /obj/item/storage/backpack

/datum/outfit/bitrunning/kim
name = "Kimball"
Expand All @@ -20,10 +22,12 @@
shoes = /obj/item/clothing/shoes/kim
suit = /obj/item/clothing/suit/kimjacket
id = /obj/item/card/id/advanced
back = /obj/item/storage/backpack

/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
back = /obj/item/storage/backpack
1 change: 1 addition & 0 deletions code/modules/mob/living/silicon/ai/_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sort_list(list(
"Triumvirate-M",
"Triumvirate",
"Weird",
"rat",
)))

/// A form of resolve_ai_icon that is guaranteed to never sleep.
Expand Down
Binary file modified icons/mob/silicon/ai.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_nova/master_files/icons/obj/clothing/hats.dmi
Binary file not shown.
3 changes: 2 additions & 1 deletion modular_nova/modules/events/code/event_spawner.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/obj/character_event_spawner
icon = 'modular_nova/modules/cryosleep/icons/cryogenics.dmi'
icon_state = "cryopod"
anchored = 1

var/list/species_whitelist
var/list/gender_whitelist
Expand All @@ -13,7 +14,7 @@
var/flavor_text = ""
var/list/additional_equipment
var/disappear_after_spawn
var/infinite = TRUE
var/infinite = FALSE
var/used = FALSE

/obj/character_event_spawner/attack_ghost(mob/user)
Expand Down
Loading
Loading