Commit Graph

77 Commits

Author SHA1 Message Date
Cadyn b90f7ec922 The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-27 20:17:32 +01:00
Drathek 3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
Selis ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
Drathek aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2 b011e089d0 [MIRROR] fixes and filters (#7452)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Selis <selis@xynolabs.com>
2023-12-21 00:50:10 +01:00
CHOMPStation2 13274e1044 [MIRROR] Armour Examine Tweaks (#7042)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-09-26 16:51:34 +02:00
CHOMPStation2 eeeea1468a [MIRROR] Makes the examine panel present more readable colours when using darkmode (#6728)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-08-06 01:08:39 +02:00
Heroman3003 db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Nadyr d26d90028d Merge pull request #5934 from CHOMPStation2/upstream-merge-14662
[MIRROR] Weapon Info on Examine
2023-03-17 03:19:20 -04:00
Heroman3003 5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc
Weapon Info on Examine
2023-03-14 18:44:19 +00:00
Heroman3003 8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00:00
Casey 88543dee02 Merge pull request #13858 from VOREStation/Cameron653-patch-1
tweaks armor descriptors
2022-10-10 03:03:46 +00:00
Casey 524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
Casey 1212aff811 Merge pull request #12797 from Very-Soft/mobexamine
Mob Examine
2022-04-20 08:25:48 +00:00
Novacat 086f4ff0b8 Merge pull request #10233 from VOREStation/upstream-merge-8053
[MIRROR] Fixes Stunrevolver PATH
2021-05-01 01:23:02 +00:00
Novacat 6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958
[MIRROR] Fixes context-menu examine expanding incorrect target
2021-03-10 19:46:45 +00:00
Razgriz 54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112 5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Cerebulon 7c57c7c0bd Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
izac112 48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera 83e9effdf7 Merge pull request #7519 from Meghan-Rossi/grassbuilding
Allows building plating on grass
2020-08-21 01:26:56 -04:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -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
Atermonera bd31afc54f Fixes examine panel icons (#6914) 2020-03-29 18:02:51 -04: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
Arokha Sieyes 1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Shadowfire 57464baadc port 0.9.9.9
just uploading so others can see work, still not ready for commitment
2020-02-08 01:11:36 +01:00
Razgriz 8968f6f527 Add files via upload 2019-12-25 04:18:45 -07:00
Repede e7a5341f2d Adds f13 (Mauser) brand cigarettes to game vending machines. 2019-10-17 19:09:57 -04:00
Neerti 9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -04:00
Leshana b4b9cea362 Make light switches constructable
Adds constructable light switches using Brown's construction stage icons.
2018-02-14 21:26:00 -05:00
Cyantime 36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Anewbe ef735ea89b Merge pull request #4098 from Neerti/10/15/2017_surface_stuff
Touches Up the Surface Somewhat
2017-10-19 09:36:03 -05:00
Neerti 95d93dae00 Touches Up the Surface Somewhat
Changes the rock texture to hopefully be a bit better.  It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature.  All trees now have health, and hitting it with things will reduce it.  Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees.  Hitting these with a sharp weapon converts them into two planks per log.  Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites.  Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
2017-10-18 12:04:39 -04:00
killer653 0f20177c5f Some more fixes 2017-10-15 19:02:26 -04:00
elgeonmb 251f5a4139 Adds drink fluff; fixes drink descriptions (#4038)
* It's not all Morpheus this time (#1)

* drink fluff

* changes drink descriptions to suck less

* Update containers.dm

* Update bottle.dm
2017-10-12 23:01:24 -05:00
Belsima f6a24337fd Examine grammar fixes. (#4051)
* Update engineering.dm

* Update atmospherics.dm

* Update mobs.dm

* Update structures.dm

* Update weapons.dm
2017-10-12 11:15:22 -05:00
elgeonmb e5474c2dc1 Food fluff (#4008)
* food fluff

* Update polaris.dme

* what the hell is Jargon 4

* screeching

* somehow that last one broke something

* how can I not spell vacuum
2017-10-02 19:59:00 -05:00
elgeonmb 9acc8a5d2c Cigarette Grammar + Lorefixes (#3999)
* Cigarette Grammar + Lorefixes

The grammar in the original was a little wonky and we all know how I feel about wonky grammar. Also made Jerichos a SAARE thing since Heph doesn't really _use_ their guns and brought fashionable menswear to the masses.

* woops made an error as I was trying not to make an error

* forgot menthols
2017-10-01 13:59:21 -05:00
Cyantime 4ba5c28eca Pipe meter examine update. 2017-09-28 19:29:56 -04:00
Cyantime 778f10b4ea Corrects pipe examine info. 2017-09-25 00:57:16 -04:00
Neerti 4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Neerti 99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
LorenLuke 14ad0d70e3 See changelog. 2017-07-16 02:58:52 -07:00
Neerti b7f74541b8 Makes Examine Panel slightly more useful.
The examine panel can now display different interactions with a few items, using icons, mostly as a proof of concept.
2017-06-11 02:52:53 -04:00
Leshana b17fb86721 Tweaks Statpanel and System Initialization 2017-06-01 21:42:08 -04:00
Anewbe 3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00