cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,258 Commits 6 Branches 0 Tags
97027f9a07f1b0c70e92f3e39cdad3eede276417
Commit Graph

92 Commits

Author SHA1 Message Date
Nadyr
d8a060732d powder that makes you say yes 2021-09-27 17:54:51 -04:00
Chompstation Bot
1b244b5de5 [MIRROR] Backports Bay/Neb random map optimizations. 2021-09-27 18:23:26 +00:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
66669af98d Merge pull request #11170 from Heroman3003/thepurge 
Finishes purge of Industrial Expansion
 2021-07-20 14:46:30 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
5b33f2c336 Decrease mine mob spawner chance 
This should halve the total amount of spawners in the mines.
 2021-06-21 00:38:09 -07:00
Razgriz
443447ba5f Bring back random mine mobs (#2205) 
* chomp mod spawner

* mob spawner

* mine mob spawner

* Update vorestation.dme

* Update caves.dm
 2021-06-16 01:52:09 -07:00
Aronai Sieyes
346acd12fd Merge pull request #10500 from VOREStation/Arokha/orz 
Makes mineral vars sensible
 2021-05-30 23:34:54 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Kassc Zeravla
84dc1e7a99 Further fixes 
-Modified Ore generation, it should spawn ores in the mines now. Will be more numerous than normal but it's a guarantee they will spawn.
-Modified 'PrideRock.DMM' to not be a endless death-trap
-Modified 'methlab.dmm' to have stuff in the safe.
-Modified 'Oldhotel.dmm' added the correct oven
-changed name of abandonedhome.dmm to lonehome.dmm see if that fixes travis (or something)
 2020-08-14 18:15:24 -04:00
Kassc Zeravla
6a6c62fe07 Adding bluespace to our universe. 
So this is a test-bench in hopes to fix our OOM issues.
I reduced all map sizes from 255x255 to 185x185
Some things to note in this changes...
-Station is still the same, just has a lot less space around it
-All shuttles now dock closer on the station
-Transition map. Shuttles have very small transition areas, one can see other shuttles or see world borders in some shuttles (Will fix later)
-Plains, Wilderness and Caves are smaller so have smaller amount POI generation, I still made it more generous so finding POI's will be easier but still less numerous than the 255x255 map.

I been testing this for hours, all transitions between vertical z-levels on SouthernCross function, transition between caves, wilderness and plains function, transition between shuttles work... About everything is exactly the same just smaller.

Please do note that this is a test, do report any bugs or inconsistent behaviors of any map.
 2020-08-11 20:15:02 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
1b87b38c4a More PoIs 2019-04-30 05:39:42 +10:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
3dfa7edb34 Removes Cracked Asteroids from Sif Mountains 
Hackfix but it works fairly well.
 2017-11-26 03:57:56 -05:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Spades
8498880ee6 Fixed the only few instances this gun appears 2017-08-07 23:53:23 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404. 
(ignore point 13)
 2017-07-16 16:03:31 -07:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
 2017-06-01 17:27:00 -04:00
Anewbe
491ae6ac9b Merge pull request #3475 from SpadesNeil/aces-gun-stuff 
Path naming of ammo to be consistent, and also fixes some gun things
 2017-05-31 18:11:25 -05:00
Yoshax
ef2883ff7e Drop pod issue fix 2017-05-30 16:32:40 +01:00
Spades
8579adcc53 Naming convention of ammo is now consistent 
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
 2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
 2017-05-26 15:29:46 -04:00
MagmaRam
2a42f9ef55 Merge pull request #3405 from Anewbe/bullet_swap 
Makes the 556 and 762 calibers more appropriate to their naming
 2017-05-21 13:17:58 -05:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
 2017-05-16 00:26:32 -04:00
Arokha Sieyes
3fc249bf8b Tether 1,8 work 
Adds solar farm to the left of z1
 2017-05-04 17:48:21 -04:00
Leshana
44ff1a70c6 Removes the datum pool, as it is not performant. 
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
 2017-05-04 01:58:33 -04:00
Anewbe
58b9c63ec2 Makes the 556 and 762 calibers more appropriate to their naming 2017-05-01 20:25:43 -05:00
Leshana
45058136e2 Replace opacity = X with set_opacity(X) so that the lighting system can update propertly. 2017-04-11 22:36:48 -04:00
Anewbe
7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
Yoshax
547053a768 if you don't rename all of something, bad things happen m'kay kids 2017-02-04 15:46:03 +00:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack 
The stack/fifty objects were really buggy, this should fix all of that in one go.
 2016-12-17 17:27:04 -06:00