Commit Graph
69 Commits
Author SHA1 Message Date
KashargulandGitHub d75f90466d removes all var/ in procs (#12738) 2026-05-05 10:55:04 +02:00
02bd5929ee [MIRROR] Fixes tesla_zap proc (#12609)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-03-28 14:51:19 -04:00
a62b9ed8fe [MIRROR] SM, Tesla, and general engineering adjustments [MDB IGNORE] [IDB IGNORE] (#12603)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-03-26 23:08:54 -04:00
45f04c0a27 [MIRROR] Cleanup (#12525)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-03-14 00:58:50 +01:00
1b8f394a14 [MIRROR] Makes uses of do_after sane (#11582)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-09-07 23:02:27 -04:00
5853b61b55 [MIRROR] New to init final (#10649)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-04-17 13:52:07 +02:00
55d696e503 [MIRROR] next new to init (#10524)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-24 22:10:59 +01:00
789db280cc [MIRROR] space cleanup (#10414)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-15 00:47:51 +01:00
65f21fb1d3 [MIRROR] end of file Fix (#10355)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-11 17:58:14 +01:00
ce2446922e [MIRROR] Initialize fixing (#10335)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-08 22:22:04 +01:00
7416cbea22 [MIRROR] next set of spans (#9247)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-18 01:33:07 +02:00
ab154b48b2 [MIRROR] refactors most spans (#9139)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-04 15:00:17 +02:00
31407a0be3 [MIRROR] First part of a span rework (#9120)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-02 16:25:48 +02:00
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084)
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-09-30 21:36:41 +02:00
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
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
84bc06d121 [MIRROR] New redgate Islands map (#6889)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2023-08-31 10:46:14 +02:00
CaseyandCHOMPStation2 48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
CaseyandCHOMPStation2 97eccd40fa Merge pull request #12659 from Very-Soft/tweaks
Adjusts trees and vendor spawners
2022-04-06 00:56:29 +00:00
CaseyandCHOMPStation2 592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
CaseyandChompstation Bot fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
NadyrandGitHub 0ccc8cf78e powder that makes you say yes 2021-08-27 20:07:14 -04:00
Chompstation Bot af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Chompstation Bot 481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot 50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Chompstation Bot 14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +00:00
Aronai SieyesandCadyn ac00965e68 cock 2021-06-19 22:03:38 -07:00
Chompstation Bot 55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot 20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Chompstation Bot e127655b5d [MIRROR] Adds the Frostbelle 2020-11-08 17:05:55 +00:00
VerkisterandChompstation Bot 2bb6e0504e Merge pull request #9217 from AmayaWah/flora-again
Creates proper names and descriptions for sprites found in amayastuff.dmi.
2020-10-19 10:41:00 +00:00
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Amaya 6cb7a5c479 adds 10 flora structures. 2020-10-01 16:55:54 +02:00
Razgriz 54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
cadyn 9101e37e6f Big woopsie-dasies fixed 2020-08-28 13:06:58 -07:00
cadyn 860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
AtermoneraandVirgoBot 4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
2020-08-27 21:45:33 -04:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07: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
Unknown 6a296e932e Conflict Resolution 2020-05-01 14:34:33 -04:00
MechoidandVirgoBot 7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
TheFurryFeline 5859b28dbe I Got No Wood
Changelog Notes:

- Prevents wood generation exploit for the holodeck that lets you get wood from holodeck generated dead/pine trees.

- Thus adding holodeck variation.
2020-02-15 22:40:47 -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