izac112
|
4088f40cc9
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2023-08-24 18:27:07 +02:00 |
|
izac112
|
ff7df50a7e
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2023-06-21 19:03:35 +02:00 |
|
Selis
|
796cc1a23f
|
oop
|
2023-06-19 00:28:57 +02:00 |
|
Selis
|
271ff9408f
|
Spell Fixes
|
2023-06-18 12:47:36 +02:00 |
|
ItsSelis
|
0680645556
|
Weakref refactor
|
2023-06-01 20:31:54 +02:00 |
|
izac112
|
38a1109e5d
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2022-08-15 17:26:15 +02:00 |
|
Heroman
|
144a973693
|
Altevian base code implementation
|
2022-07-30 05:20:53 +10:00 |
|
izac112
|
d841463eb5
|
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2022-04-27 16:11:36 +02:00 |
|
Heroman
|
383c356312
|
Adds gradual sizegun
|
2022-04-24 16:40:42 +10:00 |
|
izac112
|
c53dd6ea2a
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2022-01-31 08:24:06 +01:00 |
|
Heroman
|
ccf337a0a5
|
Fixes wrong place to put lore
|
2022-01-22 13:57:50 +10:00 |
|
izac112
|
4e14241cb8
|
Voreupdate
|
2021-07-21 15:16:48 +02:00 |
|
Aronai Sieyes
|
34982728cb
|
Add 'as anything' to various for loops
|
2021-07-20 12:39:59 -04:00 |
|
izac112
|
24460868c5
|
Lore fixy
|
2021-07-16 10:05:37 +02:00 |
|
izac112
|
fdff893613
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-05-11 00:22:20 +02:00 |
|
klaasjared
|
88c97e3469
|
Another fix
|
2021-04-29 12:45:48 -04:00 |
|
klaasjared
|
a6cdbe1899
|
Adds the new Compact Cataloguer Sprites
Adds the code and sprites for the new Compact Cataloguer
|
2021-04-29 12:35:54 -04:00 |
|
klaasjared
|
479cf6c053
|
Adds new Cataloguer sprite
I have no self control
|
2021-04-28 01:53:32 -04:00 |
|
izac112
|
8faa13454f
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-04-21 11:11:09 +02:00 |
|
Unknown
|
8127446721
|
Fixes typo
|
2021-04-19 12:11:36 -04:00 |
|
Unknown
|
627faca389
|
Updates Cataloger Entries
|
2021-04-19 11:26:30 -04:00 |
|
izac112
|
9044c9da02
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2020-08-04 00:15:48 +02:00 |
|
Unknown
|
3fe46bbf8d
|
Unlimited Credit Sharing Range
It is bad for someone to miss out on points because they were 16 tiles away instead of 14.
|
2020-08-03 14:49:24 -04:00 |
|
izac112
|
dd22d0093c
|
fixes
|
2020-06-17 04:36:50 +02:00 |
|
izac112
|
4864ad384d
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2020-06-17 04:30:06 +02:00 |
|
Killian
|
bd50595244
|
improved traffic, take two
|
2020-06-10 22:26:23 +01:00 |
|
izac112
|
e684df5236
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
|
2020-05-21 21:17:58 +02:00 |
|
Aronai Sieyes
|
09074eaabb
|
Alter playsound paradigm
|
2020-05-18 23:42:15 -04: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 |
|
 NovacatandGitHub
|
3eaa2ad9fa
|
Lore Overhaul (#7493)
* Lore Overhaul
* Further Updates
* Changes the year
* Reverts unedited files adds Dragor's file
* Fixes compile error
* Spelling error
* Fixfix
* Comma fixes!
* Parenthesis fix
* Removes Virgov references
* Purges remnants of UC
* Recommended Change
* More consistent naming
|
2020-04-29 19:59:03 -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 |
|
 AtermoneraandVirgoBot
|
b6eff8d0cf
|
cataloguers fit in belt slot (#6946)
|
2020-04-04 22:33:13 -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 |
|
Unknown
|
c5ef02af6e
|
Fixes cataloguer stuff
|
2020-02-25 15:46:42 -05:00 |
|
Unknown
|
2604093ff0
|
Species consolidation
- Consolidates the two zorren species into one zorren species.
- Merges Xenohybrid into Custom species, Xenohybrids no longer whitelisted.
|
2020-02-25 15:45:10 -05:00 |
|
SplinterGP
|
796d9fdd26
|
Adds grey to cataloguer, adds blurb, minor change in telep, adds spawn
|
2020-02-25 14:15:09 -03:00 |
|
Cebutris
|
b22008f01f
|
i probably should have tried to compile this before making the PR but i'm not that smart
|
2019-12-31 05:06:37 -05:00 |
|
Hawk_v3
|
a5c7909ed7
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-17 12:42:55 +00:00 |
|
Heroman3003
|
a3fb3e3950
|
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
|
2019-10-29 09:33:48 +10:00 |
|
Cebutris
|
14d6527103
|
delete KHI
|
2019-09-14 13:17:20 -04:00 |
|
Unknown
|
b804342c26
|
Merge remote-tracking branch 'VOREStation/master' into nova-pathfinder
|
2019-08-25 22:09:52 -04:00 |
|
Unknown
|
a7bc6b858d
|
Redemption Machine Changes
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
|
2019-08-21 20:17:39 -04:00 |
|
 MechoidandVirgoBot
|
ae48659a68
|
Exploration Expansion 1: Or, How I Learned To Love The Tree
|
2019-08-21 17:23:07 -04:00 |
|
Unknown
|
b76b717221
|
Adds compact cataloguer for Field Medics
|
2019-08-21 17:10:00 -04:00 |
|
Unknown
|
affb606207
|
Changes sprite, improves code
|
2019-08-20 04:58:52 -04:00 |
|
Unknown
|
3aa2975f61
|
Removes WIP code
|
2019-08-20 04:30:59 -04:00 |
|
Unknown
|
e112a25026
|
Lynx made a booboo
|
2019-08-20 04:01:14 -04:00 |
|
Unknown
|
a4990aedf3
|
Keeps the dmi unchanged
|
2019-08-20 03:57:30 -04:00 |
|
Unknown
|
7682bacc63
|
Adds Pathfinder's Cataloguer
Uses the tricorder sprites, the only special thing about it is that it can be closed up when stowed away. Cannot scan anything while it is closed up.
|
2019-08-20 03:55:16 -04:00 |
|
Heroman
|
e0138738f4
|
Limits new equipment properly
|
2019-08-17 12:35:44 +10:00 |
|