cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,616 Commits 8 Branches 26 Tags
b3dc5744ca3d2fdffabf367a2f5a7bac05bebb85
Commit Graph

224 Commits

Author SHA1 Message Date
Novacat
4e0cba3b80 Update kitchen.dm 2021-06-19 09:22:31 -04:00
MarinaGryphon
7ee772f6e7 Refactors utensils to use weakrefs 2021-06-18 19:02:33 -04: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
TheDavestDave
c88c88fe2c stops armour plate and armour plate inserts having the same name, and examine text as each other (#8123) 
armour plate and armour plate inserts have the same sprite, name, and examine text in game. I can fix two of  three things. You need to do stuff with amour plate inserts to make it fit in a plate carrier wile amour plate just will never fit
 2021-06-11 01:11:21 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Atermonera
8d4801b827 Ported the Bay/Nebula emote system. 2021-05-05 12:28:25 -04:00
MistakeNot4892
37717fe7b2 Tachikoma tweaks. (#7988) 
* Fixes erroneous copypaste in tachikoma join string.

* Nerfs tachikoma speed.

* Nerfs tachikoma armour.

* Added wirecutters and welder to recon platform kit.

* Swaps the explo platform chainsaw to emag item, gives them a machete instead.

* Prevents ghosts from mousedropping crates onto platforms.
 2021-03-19 05:04:00 -04:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
FenodyreeAv
efd319c851 Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-07 15:37:53 -05:00
Unknown
973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown
e6db218e71 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-02-28 14:29:46 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Aronai Sieyes
eee1ce7c04 Don't call attack_self programatically on this 2021-02-17 09:57:31 -05:00
Mechoid
02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Mechoid
40a4602d4b Adds a Whip. 2020-12-27 20:56:54 -05:00
Novacat
612f187ef6 Update twohanded.dm 2020-11-19 19:45:26 -05:00
Mechoid
a62f766bb5 Kaleidoscope 2: The Retabbening 2020-11-19 13:06:10 -05:00
Meghan-Rossi
3634234788 Fix most borosilicate shards disappearing instantly after being made (#7726) 
*Fixed borosilicate glass not producing shards in most situations.
 2020-10-17 06:06:15 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets 
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
 2020-05-22 03:55:04 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Atermonera
f4fb9ac262 Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands 
[Feature Tweak] Message Fixy For Snowballs/Kickstands
 2020-03-25 18:47:34 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes. 
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
 2019-12-25 20:40:21 +01:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
lolman360
31995aba35 Sharpening kits. (#6501) 
* one

* rtwo

* image

* Update material_weapons.dm
 2019-11-04 21:44:30 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Atermonera
524520cb8b Shards only do damage if you hit things with them (#6478) 2019-10-20 17:55:27 -04:00
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Mechoid
595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215) 
* MakeMeleeGreatAgain

* Where is melee defined?!
 2019-06-18 05:51:23 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Atermonera
eb1bbac042 Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix 
Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
 2018-10-13 17:17:27 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Anewbe
6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00