cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,862 Commits 6 Branches 0 Tags
f20f331fd6fb2bc1c2d6540ec9804cfa00d7ca08
Commit Graph

596 Commits

Author SHA1 Message Date
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Razgriz
8476073790 Merge pull request #334 from CHOMPStation2/May2020UpstreamPull 
May2020 upstream pull
 2020-05-09 21:58:55 -07:00
Razgriz
ef06089498 Update event_container_vr.dm 2020-05-09 17:52:54 -07:00
Arokha Sieyes
323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Razgriz
48644315c6 Update event_container_vr.dm 2020-05-07 02:07:08 -07:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Razgriz
5a2b073283 Update grubinfestation_vr.dm 2020-05-06 05:08:38 -07:00
Razgriz
02ba08936d Update grubinfestation_vr.dm 2020-05-06 04:54:06 -07:00
Razgriz
959f5a6fd1 Update grubinfestation_vr.dm 2020-05-06 04:42:04 -07:00
Razgriz
c6d197eb8b Update grubinfestation_vr.dm 2020-05-06 04:29:25 -07:00
Razgriz
7ebf0a547e Update grubinfestation_vr.dm 2020-05-05 23:16:32 -07:00
Aronai Sieyes
f4c8a7e2f5 Replace/Add lots of sounds from VerySoft 2020-05-05 22:43:31 -04:00
Razgriz
04e32ffd40 Update grubinfestation_vr.dm 2020-05-05 19:15:14 -07:00
Razgriz
baaf5c3a7f Update grubinfestation_vr.dm 2020-05-05 01:12:38 -07:00
Razgriz
2dd1304b68 No more solargrubs in docks 
Solargrubs don't seem to end up in any interesting places. Rather, they keep ending up in the docks. I think I'll just exclude the docks from the list and monitor where they spawn.
 2020-05-04 23:58:52 -07:00
Razgriz
56d32c5e44 Update event_container_vr.dm 
-Changed base apendiscitixicisisicsiciiticii the itus weight to -30, down from 0.

-Commented out Space Dust event because it is broken.
 2020-05-04 21:08:29 -07:00
Razgriz
106bcafedf Merge pull request #303 from CHOMPStation2/Razgriz1032-patch-42 
Comment out spider migration
 2020-04-22 03:36:13 -07:00
Razgriz
09293a0b02 Merge branch 'master' into UpstreamMergeApril2020 2020-04-22 03:17:50 -07:00
Razgriz
25f130ef9d Comment out spider migration 
Commented out spider migration as that is a YW thing that spawns spiders on carp spawns.
 2020-04-22 03:11:23 -07:00
Aronai Sieyes
1d22a745e4 Add Gravity Generator, place on tether, update events 2020-04-19 23:37:10 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
TheFurryFeline
591d1218c2 Bar's Safe, Folks. Drink On! 
Changelog Notes:

- Changes rad storm announcement to include info about how the bar's shielded in inclusion to the maints and dorms as also stated.
 2020-04-16 11:07:29 -04:00
Leshana
262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Heroman
f5e8ccd250 Adjust chances for spawnin events 2020-04-11 10:40:40 +10:00
Leshana
178d48c253 Accepting alternative Polaris code for the sake of merge simplification. 2020-04-10 19:48:00 -04:00
Aronai Sieyes
ce8bda7cd7 Merge pull request #7118 from VOREStation/vplk-shields 
Ports Baystation Advanced Shield Generators
 2020-04-07 23:53:12 -04:00
Leshana
aaa0fa5539 Cleanup code and comments. 
- Refactor ion_storm to actually operate using start()/end()/announce()
- Remove unused variable and enhance comments.
 2020-04-07 03:37:10 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix 
Rewrites the Rewritten Event System
 2020-04-06 16:23:39 -04:00
Repede
d2b0878508 Moved all commented out events into the disabled events list, may be required for ship events. 2020-04-05 19:33:19 -04:00
Repede
b2386e22f3 Fixes #658 and #644 2020-04-05 16:10:11 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Leshana
e2bd546f61 Ports advanced shield generators from Baystation 
- Creates new advanced shield generators, designed to replace old hull and bubble shield generators.
- Upgrades the floor mounted and handheld shield diffusers.
- Makes underfloor shield diffusers actually constructable.
- Handheld diffusers orderable via uplink.
- Removes supply packs and research datums  for the old generators, but leaves their code in place for maps that still use them.
- Integrates with the meteor and electrical storm events.
- Integrates with mob AI (they know how to attack it)
 2020-04-03 00:56:15 -04:00
Novacat
8c7424b3e8 VOREStation specifics for SSsupply refactor. 
Update vorestation.dme
 2020-03-27 18:28:21 -04:00
Atermonera
752d560d76 Converted old supply_controller to SSsupply 2020-03-27 17:38:05 -04:00
Aronai Sieyes
381ef78365 Fix the doom asteroid waves 2020-03-26 23:27:40 -04:00
Aronai Sieyes
710857ddd9 Same for dust 2020-03-26 12:41:01 -04:00
Aronai Sieyes
bb1494dfe3 Remove the 'has cleared the' announcement for ships 2020-03-26 11:55:40 -04:00
Leshana
9d335cf678 Quick fix to ensure events with skyboxes remove them at the end. 2020-03-24 22:16:48 -04:00
Aronai Sieyes
ac419404cb Fix Dust level choice 2020-03-24 20:51:12 -04:00
Aronai Sieyes
7dcfd12266 Merge pull request #6946 from VOREStation/aro-announce 
Don't announce overmap events
 2020-03-23 21:40:46 -04:00
Unknown
8e0bd119b2 Real Crash Fix 
Remind me never to code when dead tired
 2020-03-22 09:18:20 -04:00
Unknown
004e3682a0 Emergency Crash Fix 2020-03-21 23:53:51 -04:00
Aronai Sieyes
d8d7ebf99a Remove announcements from overmap events 2020-03-21 19:17:36 -04:00
Leshana
41aa31f847 Refactor carp event to optionally use landmarks if present and stop at the edge of space. 2020-03-19 20:29:43 -04:00
Leshana
c8129e24fb Restrict dust, meteors and space carp events to space z-levels only. 2020-03-19 20:29:43 -04:00
Leshana
f2a582569b Ports overmap events from Baystation12 
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
 2020-03-19 20:29:43 -04:00