cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,480 Commits 8 Branches 0 Tags
c6d197eb8b7bb8ca603c007ae122db4d7ef73e44
Commit Graph

474 Commits

Author SHA1 Message Date
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
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
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
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07: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
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
Leshana
3e3241eeb2 Make area.gravitychange not require being passed a reference to... itself. (#6838) 2020-03-16 05:32:20 -04:00
Unknown
d23683c2f0 MROWL 2020-03-09 02:37:25 -04:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Heroman3003
b12348f909 Merge branch 'master' into maint_pred 2020-02-24 11:00:59 +10:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Razgriz
5846fe0194 Restore original message 2020-02-13 23:46:49 -07:00
Razgriz
b558c7d172 Restore original message 2020-02-13 23:45:12 -07:00
Razgriz
f049d5c44b Restore original messages 2020-02-13 23:43:44 -07:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
0ebf8b163a Removes Crate Mimic from list of available maintenance preds 2020-02-13 09:40:29 +10:00
Heroman
5ba0e0805c Prevents the pred going buck wild if player leaves 2020-02-13 09:39:32 +10:00
Heroman
3f75b09ea2 Fixes morph spawn event bugs 2020-02-12 12:36:22 +10:00
Heroman
8ac52fef61 Adds Maintenance Predator random event 2020-02-12 12:33:46 +10:00
Heroman3003
6a75d126b2 Merge branch 'master' into superpod 2020-02-10 23:08:57 +10:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01: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
RadiantFlash7
8704ce4f39 Typo fixes 
Typofixes in event anouncements.
 2020-01-25 01:29:13 -05:00