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
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
TheFurryFeline
3742f242d8
Revert Changes
...
Title.
Changelog Notes:
- Revert changes to Rouge Drone event output regarding what's where.
2020-01-14 10:55:59 -05: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
Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07: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
Razgriz
0aae784d23
Update event_container_vr.dm
2019-12-29 00:42:41 -07:00
Razgriz
27cd3c75bf
Update event_container_vr.dm
2019-12-29 00:29:37 -07:00
Razgriz
3f1a61b23b
Update event_container_vr.dm
2019-12-29 00:22:24 -07:00
Razgriz
b8781f3cb4
Update event_dynamic.dm
2019-12-29 00:03:15 -07:00
TheFurryFeline
3b2b52f097
AAAAAAAAAA
2019-12-25 18:18:24 -05:00
TheFurryFeline
f209536501
Missed a Few
2019-12-25 18:17:48 -05:00
TheFurryFeline
d467f128fb
Revert event_container_vr.dm Changes
...
Slight placement fix of a comment pertaining solar storm event.
2019-12-25 18:12:06 -05:00
TheFurryFeline
78cafd9421
Fixes
...
Changelog Notes:
- Removes wikilinks for species.
- Removes lonilness trait for Teshari.
- Re-syncs events list with Chompers v1's current, comments out those not coded in quite yet for later.
2019-12-24 15:24:06 -05:00
