mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
Merge remote-tracking branch 'skrat/master' into upstream-sept-24
# Conflicts: # .github/workflows/ci_suite.yml # _maps/skyrat/automapper/templates/metastation/metastation_armory.dmm # _maps/skyrat/lazy_templates/reebe.dmm # code/datums/quirks/negative_quirks/negative_quirks.dm # code/datums/quirks/neutral_quirks/neutral_quirks.dm # code/game/objects/items/robot/robot_upgrades.dm # code/modules/mining/equipment/kinetic_crusher.dm # code/modules/surgery/revival.dm # code/modules/uplink/uplink_items/device_tools.dm # modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm # modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm # modular_skyrat/modules/company_imports/code/armament_datums/nri_military_surplus.dm # modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm # modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm # modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm # modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
/**
|
||||
* So far, only used by the fishing minigame. Feel free to rename it to something like veryfastprocess
|
||||
* if you need one that fires 10 times a second
|
||||
*/
|
||||
PROCESSING_SUBSYSTEM_DEF(fishing)
|
||||
name = "Fishing"
|
||||
wait = 0.1 SECONDS
|
||||
@@ -23,6 +23,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
|
||||
list(/datum/quirk/spacer_born, /datum/quirk/paraplegic, /datum/quirk/item_quirk/settler),
|
||||
list(/datum/quirk/photophobia, /datum/quirk/nyctophobia),
|
||||
list(/datum/quirk/item_quirk/settler, /datum/quirk/freerunning),
|
||||
list(/datum/quirk/numb, /datum/quirk/selfaware),
|
||||
//SKYRAT EDIT ADDITION BEGIN
|
||||
list(/datum/quirk/equipping/nerve_staple, /datum/quirk/nonviolent),
|
||||
list(/datum/quirk/equipping/nerve_staple, /datum/quirk/item_quirk/nearsighted),
|
||||
|
||||
Reference in New Issue
Block a user