cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 5 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

408 Commits

Author SHA1 Message Date
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
3f75b09ea2 Fixes morph spawn event bugs 2020-02-12 12:36:22 +10:00
Heroman3003
6a75d126b2 Merge branch 'master' into superpod 2020-02-10 23:08:57 +10:00
Heroman
0915cfd9e5 Resolves conflicts, updates description 2020-01-28 13:05:55 +10:00
Heroman
308ee2dc6a Limites the locations at which drone pod can drop 2020-01-28 10:20:59 +10:00
Heroman
fbf40198bd Removes redundant code 2020-01-16 14:57:27 +10:00
Heroman3003
d2073b6ad8 Merge branch 'master' into morphevent 2020-01-16 14:55:19 +10:00
Atermonera
4fb26a6429 Merge pull request #6620 from Heroman3003/eventpause 
Pauses event processing while doing event actions
 2020-01-15 23:43:46 -05:00
Heroman
6a21fccabd Fixes the fix for drone pod announcement 2020-01-16 13:47:52 +10:00
Heroman3003
4af118cb0d Merge branch 'master' into morphevent 2020-01-16 09:00:43 +10:00
Novacat
9a6271b42a Merge pull request #6442 from Heroman3003/grubfix 
Fixes grub event end announcement not functioning
 2020-01-13 16:55:55 -05:00
Heroman
ede140ec9c Fixes grub event end announcement not functioning 2020-01-14 05:58:38 +10:00
Heroman
737d37321b Fixes droppod spawning wrong subtype 2020-01-13 17:48:33 +10:00
Heroman
aa53bdc0ed Fixes drone droppod not being announced 2020-01-13 16:51:12 +10:00
Heroman
5077419f4e Adds endWhen 2020-01-13 16:14:00 +10:00
Heroman
ff86124af5 Makes event not do fake announcements when it fails to spawn something. 2020-01-13 15:53:29 +10:00
Heroman
43760db7dd Adds Morph Spawn event 2020-01-11 20:15:10 +10:00
Heroman
47086d7bf0 Adds new event: drone drop pod 2020-01-11 16:02:12 +10:00
TheFurryFeline
53cd282a91 Combat Drone Location Fixy 
VOREStation edits for Sif -> Virgo 3B orbit, basically.

Changelog Notes:

- Changes instances of Sif to Virgo 3b since Tether is in Virgo-Erigonne.
 2019-12-16 22:59:03 -05:00
Novacat
d8ebe84bcd Update event_container_vr.dm 2019-10-24 00:51:50 -04:00
Novacat
84c456f71d Update event_container_vr.dm 2019-10-24 00:50:50 -04:00
Unknown
9e3d7d6e41 Rarer spooders 2019-10-23 20:41:25 -04:00
Unknown
9506ceef67 Feedback changes 2019-10-23 20:39:44 -04:00
Unknown
34d9b19eaa Disables Ian Storm 2019-10-22 09:30:37 -04:00
Unknown
5de11f59fe Removes major meteor wave 2019-10-21 23:42:51 -04:00
Unknown
c6d8cc4a22 Rarer events, more event variety 
- Reduces the chances of a mundane and moderate event firing by 50%
- Reduces the chances of a major event firing by 75%
- Re-adds most Polaris events. Notables include carp, spider infestations, rogue drones, vines, and meteors.
- Grubs upped to major event
- Station-spawned spiderlings can no longer grow up to be nurse spiders.
- Fixes and re-enables the Ian storm event
 2019-10-21 22:53:59 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Heroman
ee36015a0f Also restricts spam 2019-09-04 04:27:07 +10:00
Novacat
4f13d0bb42 Update ion_storm.dm 2019-08-06 15:30:47 -04:00
Atermonera
e0d157294e Lowers Bot Emag Chance from Ion Storm 2019-08-06 14:57:30 -04:00
Atermonera
b30b24450d Merge pull request #6265 from Heroman3003/camerafix 
Fixes technical cameras being affected by random event
 2019-07-03 23:09:33 -04:00
Neerti
914fc74a7a Merge pull request #6182 from mistyLuminescence/eventroundstart 
No More Pre-Roundstart Events
 2019-05-28 14:24:35 -04:00
Neerti
f830985d38 Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG 
[RNG is the new RNG] Converts a bunch of events to the Game Master datum system.
 2019-05-13 22:57:23 -04:00
Heroman
9717bdd8f8 Reduced likelyhood of solargrub events 2019-05-01 10:54:37 +10:00
Heroman3003
1b23826267 Fixes Solargrubs. 2019-04-25 12:21:44 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Spades
4b19e3a9b3 Merge pull request #4538 from VOREStation/upstream-merge-5726 
[MIRROR] Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
 2019-02-23 12:01:38 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
bf86b408fa Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed 2018-12-03 20:21:17 -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
atermonera
ef6c5abf15 Refactors supply controller. 
Supply consoles now run nanoUI
 2018-07-31 19:11:02 -07:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00