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
52,211 Commits 6 Branches 0 Tags
4cf7f71be6d1720990445cb41ff187d3a5fcd2c5
Commit Graph

422 Commits

Author SHA1 Message Date
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
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
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
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
RadiantFlash7
c70cf7ffa0 Viral addition 
Re-adds Viruses as a major event. Blobs and Radiation seemed to turn out alright, and most viruses can be cured with spacecillin.
Worth trying out, atleast.
 2020-01-14 00:02:34 -05:00
RadiantFlash7
0388927ba1 fluffies events 
Fluffieifes events for cryogaia outpost.
 2020-01-13 23:51:20 -05: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
Hawk_v3
33c345c34a Fixing lists for merge. 
Missing commas, man.
 2020-01-13 18:45:44 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00: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
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00: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
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
RadiantFlash7
79d95df0d2 FIxes events (Thanks virgo) 
fixes events listing thats enabled, AND adds firelocks to evacuation.
 2019-12-17 18:27:58 -05: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
RadiantFlash7
b459191717 disables solar storm 
Solar Storms disabled.
Minor map fixes and changes.
 2019-12-15 03:03:40 -05:00
RadiantFlash7
4bf53cacde Heckin, fixed my notations ;-; 
Rude host, making me be a proper coder and not suck.
 2019-12-14 23:54:05 -05:00
RadiantFlash7
2216d15f6a deliniates changes of YW in non YW files 
Fixes some more map stuff.
 2019-12-14 23:40:22 -05:00
RadiantFlash7
3b5974d125 Release day fixes 
Release day fixes!
Event disables/added stuff,
Tons of map issues fixed.
 2019-12-14 23:09:31 -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