cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

#undef is now required for all file defines (#24091)

Browse Source 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
This commit is contained in:
Contrabang
2024-03-11 14:03:30 -04:00
committed by GitHub
parent 47f3b87a9f
commit e32544e599
172 changed files with 1412 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/arcade/mob_hunt/mob_datums.dm
+28 -46
View File
@@ -1,22 +1,4 @@
#define TYPE_FIRE /datum/mob_type/fire
#define TYPE_WATER /datum/mob_type/water
#define TYPE_GRASS /datum/mob_type/grass
#define TYPE_ELECTRIC /datum/mob_type/electric
#define TYPE_GROUND /datum/mob_type/ground
#define TYPE_ROCK /datum/mob_type/rock
#define TYPE_BUG /datum/mob_type/bug
#define TYPE_POISON /datum/mob_type/poison
#define TYPE_NORMAL /datum/mob_type/normal
#define TYPE_FIGHTING /datum/mob_type/fighting
#define TYPE_PSYCHIC /datum/mob_type/psychic
#define TYPE_GHOST /datum/mob_type/ghost
#define TYPE_ICE /datum/mob_type/ice
#define TYPE_FLYING /datum/mob_type/flying
#define TYPE_BLUESPACE /datum/mob_type/bluespace
#define TYPE_DARK /datum/mob_type/dark
#define TYPE_STEEL /datum/mob_type/steel
/datum/mob_hunt
//GENERAL STATS AND VARIABLES
var/mob_name = "Generic Mob" //the mob's original name (its species/type/whatever)
@@ -280,7 +262,7 @@
run_chance = 50
min_level = 1
max_level = 10
primary_type = TYPE_BUG
primary_type = NANOMOB_TYPE_BUG
icon_state_normal = "nemabug"
icon_state_shiny = "nemabug_shiny"
lifetime = 6000
@@ -290,7 +272,7 @@
run_chance = 50
min_level = 5
max_level = 15
primary_type = TYPE_ICE
primary_type = NANOMOB_TYPE_ICE
icon_state_normal = "stoutquill"
icon_state_shiny = "stoutquill_shiny"
lifetime = 4500
@@ -300,7 +282,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_POISON
primary_type = NANOMOB_TYPE_POISON
icon_state_normal = "spectra"
icon_state_shiny = "spectra_shiny"
lifetime = 6000
@@ -310,7 +292,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_FIRE
primary_type = NANOMOB_TYPE_FIRE
icon_state_normal = "dunny"
icon_state_shiny = "dunny_shiny"
lifetime = 6000
@@ -320,7 +302,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_ROCK
primary_type = NANOMOB_TYPE_ROCK
icon_state_normal = "buffsel"
icon_state_shiny = "buffsel_shiny"
lifetime = 6000
@@ -330,7 +312,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_NORMAL
primary_type = NANOMOB_TYPE_NORMAL
icon_state_normal = "quarrel"
icon_state_shiny = "quarrel_shiny"
lifetime = 6000
@@ -340,7 +322,7 @@
run_chance = 50
min_level = 5
max_level = 15
primary_type = TYPE_DARK
primary_type = NANOMOB_TYPE_DARK
icon_state_normal = "vulerrt"
icon_state_shiny = "vulerrt_shiny"
turf_whitelist = list()
@@ -351,7 +333,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_ELECTRIC
primary_type = NANOMOB_TYPE_ELECTRIC
icon_state_normal = "strudel"
icon_state_shiny = "strudel_shiny"
lifetime = 4500
@@ -361,7 +343,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_WATER
primary_type = NANOMOB_TYPE_WATER
icon_state_normal = "folstick"
icon_state_shiny = "folstick_shiny"
lifetime = 6000
@@ -371,7 +353,7 @@
run_chance = 50
min_level = 5
max_level = 15
primary_type = TYPE_PSYCHIC
primary_type = NANOMOB_TYPE_PSYCHIC
icon_state_normal = "glimmerflare"
icon_state_shiny = "glimmerflare_shiny"
lifetime = 4500
@@ -381,7 +363,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_GRASS
primary_type = NANOMOB_TYPE_GRASS
icon_state_normal = "leecoon"
icon_state_shiny = "leecoon_shiny"
lifetime = 6000
@@ -391,7 +373,7 @@
run_chance = 35
min_level = 1
max_level = 10
primary_type = TYPE_FLYING
primary_type = NANOMOB_TYPE_FLYING
icon_state_normal = "halk"
icon_state_shiny = "halk_shiny"
lifetime = 6000
@@ -401,8 +383,8 @@
run_chance = 65
min_level = 5
max_level = 20
primary_type = TYPE_ELECTRIC
secondary_type = TYPE_BUG
primary_type = NANOMOB_TYPE_ELECTRIC
secondary_type = NANOMOB_TYPE_BUG
icon_state_normal = "gooby"
icon_state_shiny = "gooby_shiny"
lifetime = 3000
@@ -412,7 +394,7 @@
run_chance = 50
min_level = 5
max_level = 15
primary_type = TYPE_GHOST
primary_type = NANOMOB_TYPE_GHOST
icon_state_normal = "pandoom"
icon_state_shiny = "pandoom_shiny"
lifetime = 4500
@@ -422,8 +404,8 @@
run_chance = 65
min_level = 5
max_level = 20
primary_type = TYPE_FIRE
secondary_type = TYPE_GROUND
primary_type = NANOMOB_TYPE_FIRE
secondary_type = NANOMOB_TYPE_GROUND
icon_state_normal = "relish"
icon_state_shiny = "relish_shiny"
lifetime = 3000
@@ -433,8 +415,8 @@
run_chance = 50
min_level = 5
max_level = 10
primary_type = TYPE_FIRE
secondary_type = TYPE_NORMAL
primary_type = NANOMOB_TYPE_FIRE
secondary_type = NANOMOB_TYPE_NORMAL
icon_state_normal = "xofine"
icon_state_shiny = "xofine_shiny"
lifetime = 3000
@@ -444,8 +426,8 @@
run_chance = 65
min_level = 5
max_level = 20
primary_type = TYPE_WATER
secondary_type = TYPE_POISON
primary_type = NANOMOB_TYPE_WATER
secondary_type = NANOMOB_TYPE_POISON
icon_state_normal = "gitten"
icon_state_shiny = "gitten_shiny"
lifetime = 3000
@@ -455,8 +437,8 @@
run_chance = 65
min_level = 5
max_level = 20
primary_type = TYPE_GRASS
secondary_type = TYPE_NORMAL
primary_type = NANOMOB_TYPE_GRASS
secondary_type = NANOMOB_TYPE_NORMAL
icon_state_normal = "nai"
icon_state_shiny = "nai_shiny"
lifetime = 3000
@@ -466,8 +448,8 @@
run_chance = 65
min_level = 5
max_level = 20
primary_type = TYPE_FIRE
secondary_type = TYPE_GHOST
primary_type = NANOMOB_TYPE_FIRE
secondary_type = NANOMOB_TYPE_GHOST
icon_state_normal = "pyroghast"
icon_state_shiny = "pyroghast"
lifetime = 4500
@@ -477,8 +459,8 @@
run_chance = 65
min_level = 5
max_level = 20
primary_type = TYPE_FIGHTING
secondary_type = TYPE_ICE
primary_type = NANOMOB_TYPE_FIGHTING
secondary_type = NANOMOB_TYPE_ICE
icon_state_normal = "starslam"
icon_state_shiny = "starslam_shiny"
lifetime = 2500
@@ -488,7 +470,7 @@
run_chance = 85
min_level = 10
max_level = 20
primary_type = TYPE_BLUESPACE
primary_type = NANOMOB_TYPE_BLUESPACE
icon_state_normal = "pheron"
icon_state_shiny = "pheron_shiny"
area_blacklist = list()
code/modules/arcade/mob_hunt/mob_type_datums.dm
+108 -108
View File
@@ -14,14 +14,14 @@
//Type defines, to avoid spelling mistakes
/datum/mob_type/fire
name = "Fire"
weakness = list(TYPE_WATER,
TYPE_ROCK,
TYPE_GROUND)
resistance = list(TYPE_BUG,
TYPE_FIRE,
TYPE_GRASS,
TYPE_ICE,
TYPE_STEEL)
weakness = list(NANOMOB_TYPE_WATER,
NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_GROUND)
resistance = list(NANOMOB_TYPE_BUG,
NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_ICE,
NANOMOB_TYPE_STEEL)
area_blacklist = list(/area/station/public/toilet,
/area/station/science/server/coldroom)
area_whitelist = list(/area/station/maintenance/turbine,
@@ -31,12 +31,12 @@
/datum/mob_type/water
name = "Water"
weakness = list(TYPE_ELECTRIC,
TYPE_GRASS)
resistance = list(TYPE_FIRE,
TYPE_ICE,
TYPE_STEEL,
TYPE_WATER)
weakness = list(NANOMOB_TYPE_ELECTRIC,
NANOMOB_TYPE_GRASS)
resistance = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_ICE,
NANOMOB_TYPE_STEEL,
NANOMOB_TYPE_WATER)
area_blacklist = list(/area/station/maintenance/turbine,
/area/station/maintenance/incinerator,
/area/station/service/kitchen)
@@ -45,15 +45,15 @@
/datum/mob_type/grass
name = "Grass"
weakness = list(TYPE_FIRE,
TYPE_BUG,
TYPE_POISON,
TYPE_ICE,
TYPE_FLYING)
resistance = list(TYPE_WATER,
TYPE_GRASS,
TYPE_ELECTRIC,
TYPE_GROUND)
weakness = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_BUG,
NANOMOB_TYPE_POISON,
NANOMOB_TYPE_ICE,
NANOMOB_TYPE_FLYING)
resistance = list(NANOMOB_TYPE_WATER,
NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_ELECTRIC,
NANOMOB_TYPE_GROUND)
area_blacklist = list(/area/station/science)
area_whitelist = list(/area/station/service/hydroponics,
/area/station/public/construction) // dont ask me why grass types can appear in construction sites, I'm just migrating areas
@@ -61,10 +61,10 @@
/datum/mob_type/electric
name = "Electric"
weakness = list(TYPE_GROUND)
resistance = list(TYPE_ELECTRIC,
TYPE_FLYING,
TYPE_STEEL)
weakness = list(NANOMOB_TYPE_GROUND)
resistance = list(NANOMOB_TYPE_ELECTRIC,
NANOMOB_TYPE_FLYING,
NANOMOB_TYPE_STEEL)
area_whitelist = list(/area/station/engineering/engine,
/area/station/science/server,
/area/station/maintenance,
@@ -77,24 +77,24 @@
/datum/mob_type/ground
name = "Ground"
weakness = list(TYPE_WATER,
TYPE_GRASS,
TYPE_ICE)
resistance = list(TYPE_ROCK,
TYPE_POISON)
immunity = list(TYPE_ELECTRIC)
weakness = list(NANOMOB_TYPE_WATER,
NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_ICE)
resistance = list(NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_POISON)
immunity = list(NANOMOB_TYPE_ELECTRIC)
/datum/mob_type/rock
name = "Rock"
weakness = list(TYPE_WATER,
TYPE_GRASS,
TYPE_GROUND,
TYPE_FIGHTING,
TYPE_STEEL)
resistance = list(TYPE_FIRE,
TYPE_FLYING,
TYPE_POISON,
TYPE_NORMAL)
weakness = list(NANOMOB_TYPE_WATER,
NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_GROUND,
NANOMOB_TYPE_FIGHTING,
NANOMOB_TYPE_STEEL)
resistance = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_FLYING,
NANOMOB_TYPE_POISON,
NANOMOB_TYPE_NORMAL)
area_whitelist = list(/area/station/supply,
/area/station/maintenance/disposal)
turf_whitelist = list(/turf/simulated/wall,
@@ -102,12 +102,12 @@
/datum/mob_type/bug
name = "Bug"
weakness = list(TYPE_FIRE,
TYPE_ROCK,
TYPE_FLYING)
resistance = list(TYPE_GRASS,
TYPE_GROUND,
TYPE_FIGHTING)
weakness = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_FLYING)
resistance = list(NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_GROUND,
NANOMOB_TYPE_FIGHTING)
area_blacklist = list(/area/station/science)
area_whitelist = list(/area/station/service/hydroponics,
/area/station/public/construction) // dont ask me why bug types can appear in construction sites, I'm just migrating areas
@@ -115,12 +115,12 @@
/datum/mob_type/poison
name = "Poison"
weakness = list(TYPE_GROUND,
TYPE_PSYCHIC)
resistance = list(TYPE_GRASS,
TYPE_BUG,
TYPE_POISON,
TYPE_FIGHTING)
weakness = list(NANOMOB_TYPE_GROUND,
NANOMOB_TYPE_PSYCHIC)
resistance = list(NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_BUG,
NANOMOB_TYPE_POISON,
NANOMOB_TYPE_FIGHTING)
area_blacklist = list(/area/station/medical,
/area/station/service/janitor)
area_whitelist = list(/area/station/medical/virology,
@@ -130,16 +130,16 @@
/datum/mob_type/normal
name = "Normal"
weakness = list(TYPE_FIGHTING)
immunity = list(TYPE_GHOST)
weakness = list(NANOMOB_TYPE_FIGHTING)
immunity = list(NANOMOB_TYPE_GHOST)
/datum/mob_type/fighting
name = "Fighting"
weakness = list(TYPE_PSYCHIC,
TYPE_FLYING)
resistance = list(TYPE_ROCK,
TYPE_BUG,
TYPE_DARK)
weakness = list(NANOMOB_TYPE_PSYCHIC,
NANOMOB_TYPE_FLYING)
resistance = list(NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_BUG,
NANOMOB_TYPE_DARK)
area_blacklist = list(/area/station/medical)
area_whitelist = list(/area/station/service/bar,
/area/station/public/fitness,
@@ -148,11 +148,11 @@
/datum/mob_type/psychic
name = "Psychic"
weakness = list(TYPE_BUG,
TYPE_GHOST,
TYPE_DARK)
resistance = list(TYPE_FIGHTING,
TYPE_PSYCHIC)
weakness = list(NANOMOB_TYPE_BUG,
NANOMOB_TYPE_GHOST,
NANOMOB_TYPE_DARK)
resistance = list(NANOMOB_TYPE_FIGHTING,
NANOMOB_TYPE_PSYCHIC)
area_blacklist = list(/area/station/science,
/area/station/command/office/rd,
/area/station/maintenance/asmaint2,
@@ -164,23 +164,23 @@
/datum/mob_type/ghost
name = "Ghost"
weakness = list(TYPE_GHOST,
TYPE_DARK)
resistance = list(TYPE_BUG,
TYPE_POISON)
immunity = list(TYPE_NORMAL,
TYPE_FIGHTING)
weakness = list(NANOMOB_TYPE_GHOST,
NANOMOB_TYPE_DARK)
resistance = list(NANOMOB_TYPE_BUG,
NANOMOB_TYPE_POISON)
immunity = list(NANOMOB_TYPE_NORMAL,
NANOMOB_TYPE_FIGHTING)
area_whitelist = list(/area/station/medical/morgue,
/area/station/service/chapel,
/area/station/medical/cloning)
/datum/mob_type/ice
name = "Ice"
weakness = list(TYPE_FIRE,
TYPE_ROCK,
TYPE_FIGHTING,
TYPE_STEEL)
resistance = list(TYPE_ICE)
weakness = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_FIGHTING,
NANOMOB_TYPE_STEEL)
resistance = list(NANOMOB_TYPE_ICE)
area_blacklist = list(/area/station/maintenance/turbine,
/area/station/maintenance/incinerator,
/area/station/service/kitchen)
@@ -188,32 +188,32 @@
/datum/mob_type/flying
name = "Flying"
weakness = list(TYPE_ELECTRIC,
TYPE_ROCK,
TYPE_ICE)
resistance = list(TYPE_GRASS,
TYPE_BUG,
TYPE_FIGHTING)
immunity = list(TYPE_GROUND)
weakness = list(NANOMOB_TYPE_ELECTRIC,
NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_ICE)
resistance = list(NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_BUG,
NANOMOB_TYPE_FIGHTING)
immunity = list(NANOMOB_TYPE_GROUND)
area_blacklist = list(/area/station/maintenance)
area_whitelist = list(/area/station/hallway)
/datum/mob_type/bluespace
name = "Bluespace"
weakness = list(TYPE_ICE,
TYPE_BLUESPACE)
resistance = list(TYPE_FIRE,
TYPE_WATER,
TYPE_GRASS,
TYPE_ELECTRIC)
weakness = list(NANOMOB_TYPE_ICE,
NANOMOB_TYPE_BLUESPACE)
resistance = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_WATER,
NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_ELECTRIC)
/datum/mob_type/dark
name = "Dark"
weakness = list(TYPE_BUG,
TYPE_FIGHTING)
resistance = list(TYPE_GHOST,
TYPE_DARK)
immunity = list(TYPE_PSYCHIC)
weakness = list(NANOMOB_TYPE_BUG,
NANOMOB_TYPE_FIGHTING)
resistance = list(NANOMOB_TYPE_GHOST,
NANOMOB_TYPE_DARK)
immunity = list(NANOMOB_TYPE_PSYCHIC)
area_blacklist = list(/area/station/engineering/solar,
/area/station/maintenance/auxsolarport,
/area/station/maintenance/starboardsolar,
@@ -226,16 +226,16 @@
/datum/mob_type/steel
name = "Steel"
weakness = list(TYPE_FIRE,
TYPE_GROUND,
TYPE_FIGHTING)
resistance = list(TYPE_GRASS,
TYPE_ROCK,
TYPE_BUG,
TYPE_NORMAL,
TYPE_PSYCHIC,
TYPE_ICE,
TYPE_FLYING,
TYPE_BLUESPACE,
TYPE_STEEL)
immunity = list(TYPE_POISON)
weakness = list(NANOMOB_TYPE_FIRE,
NANOMOB_TYPE_GROUND,
NANOMOB_TYPE_FIGHTING)
resistance = list(NANOMOB_TYPE_GRASS,
NANOMOB_TYPE_ROCK,
NANOMOB_TYPE_BUG,
NANOMOB_TYPE_NORMAL,
NANOMOB_TYPE_PSYCHIC,
NANOMOB_TYPE_ICE,
NANOMOB_TYPE_FLYING,
NANOMOB_TYPE_BLUESPACE,
NANOMOB_TYPE_STEEL)
immunity = list(NANOMOB_TYPE_POISON)