cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-22 04:28:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,630 Commits 13 Branches 0 Tags
far-mining
Commit Graph
74 Commits
Author SHA1 Message Date
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Heroman3003andGitHub ec2ea599ed Update weldingtool.dm 2023-01-19 12:33:24 +10:00
AtermoneraandVirgoBot 1966acb410 Repairing light robotic damage messaging fix 2023-01-15 14:04:19 -05:00
izac112 dc36fe9b8f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 22:52:41 +02:00
C.L 180ac762bf Fixes hitting patient on optable with welder. 
Fixes a bug with FBP being attacked with the welder intead of healed properly when on help intent.
 2022-10-04 16:44:51 -04:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892andVirgoBot 3f9af78f3a /atom New() => Initialize() [MDB IGNORE] 2021-11-14 03:09:51 -05:00
izac112 a274077bfa Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-10-28 21:04:37 +02:00
klaasjared e61bfc7dfb Size increase 
Adds alpha blocks to artificially increase size
 2021-10-22 23:29:52 -04:00
klaasjared cb05597d08 Secondary Commit 2021-10-22 23:29:49 -04:00
izac112 dd8893112f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-08 09:40:23 +02:00
Aronai SieyesandGitHub 8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
izac112 0c4740f290 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-06 09:10:52 +02:00
MarinaGryphon e41c2ecfd7 first pass (emotification, some \the -> \The) 2021-07-05 09:42:48 -05:00
izac112 f6878064b3 Merge branches 'izac' and 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-04 22:09:57 +02:00
Aronai Sieyes b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
AtermoneraandVirgoBot f859e9ba8c Merge pull request #8158 from Novacat/nova-oreprocessor 
Halves Item Slowdown Effects
 2021-06-28 01:53:10 -04:00
izac112 ffc6a2a369 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-18 17:01:47 +02:00
Aronai Sieyes 1696db4842 Move most/all overlay use to SSoverlays 
Except for the ones I'm about to change in the
lighting commits!
 2021-06-17 00:11:13 -04:00
izac112 fdff893613 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-11 00:22:20 +02:00
ShadowLarkens 5c3a8254d0 Fix welding tools and cable coils as tools 2021-05-02 18:30:18 -07:00
izac112 054b1f0f8a Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2021-03-01 17:25:41 +01:00
MistakeNot4892andUnknown 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
izac112 5d64303087 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-11-17 16:26:30 +01:00
Shadow-QuillandVirgoBot a82521cab5 No more unnearsightedness! (#7753) 
* No more unnearsightedness!

* Oops

* Oops pt 2
 2020-11-04 13:27:03 -05:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
AtermoneraandVirgoBot b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools 
Hybrid tools buffs.
 2020-05-21 14:32:45 -04: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
Aronai SieyesandVirgoBot 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes 57f28af1fd Prevent protean repairs using fire and cables 
Doesn't make much sense
 2020-04-27 11:18:03 -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
AtermoneraandVirgoBot 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
NovacatandGitHub 3c06d62345 Update weldingtool.dm 2020-03-08 03:25:18 -04:00
MechoidandVirgoBot acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -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
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
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
AtermoneraandVirgoBot 6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Hawk_v3 0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
MechoidandVirgoBot ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Hawk_v3 50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
NeertiandVirgoBot 197bedb2eb Merge pull request #6086 from Heroman3003/welder-fires 
Fixes self-refueling welders starting fires when off
 2019-04-15 18:31:37 -04:00
Hawk_v3 41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00