cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 5 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

95 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
0180cc74c5 [MIRROR] usr to user up to player effects (#9552) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-01 18:31:19 +01:00
CHOMPStation2
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
CHOMPStation2
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
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
Raeschen
e29b9d4d35 Reversions and fixes (#7889) 
Co-authored-by: Selis <selis@xynolabs.com>
 2024-03-06 18:20:29 +01:00
Heroman3003
9926ef6647 Merge pull request #15099 from Heroman3003/misc-fixes 
A variety of miscellaneous bugfixes
 2023-07-01 23:33:38 +00:00
Heroman3003
dc9fca2f8a Merge pull request #14859 from KillianKirilenko/kk-nanofix 
Mech Nanopaste repairs fix
 2023-05-19 19:03:34 +00:00
Verkister
55405efb29 Update stack.dm 2023-05-10 15:17:14 +03:00
Verkister
10404c83ed Makes stack_trace error message a little more descriptive. 
What's worse than vagueposting is vagueposting in runtime logs at spam rate of 36000 messages per hour.
 2023-05-10 15:11:10 +03:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Casey
8a0aef53f8 Merge pull request #13658 from Heroman3003/stackruntime 
fixes runtime with stack dna transfer
 2022-09-04 21:50:22 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
780499fff6 Merge pull request #12295 from Very-Soft/stackpersist 
Item Bank - Do not store things crafted from material stacks
 2022-02-20 01:36:58 +00:00
Test Turtle
3c06b4dc19 Update to Sheet Materials 
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
 2022-02-07 17:20:45 -08:00
Nadyr
d1efe83113 Merge branch 'master' into upstream-merge-11508 2021-08-26 21:00:44 -04:00
Chompstation Bot
4cd79beb29 Fix annoying runtime with exosuit fab 2021-08-27 00:11:54 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Novacat
b291d87e18 Merge pull request #11387 from Heroman3003/dupefix 
Fixes infinite material duplication in R&D
 2021-08-11 02:51:43 +00:00
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
32f728a713 Merge pull request #9572 from VOREStation/upstream-merge-7824 
[MIRROR] Sheet Recipe Unexclusivity.
 2021-01-14 18:05:02 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes
a03a3c0960 Change stack autocombine 
Only happens when dropped or pulled by a mob, to avoid problems with stack-using machines and conveyors in mining
 2020-05-18 22:35:13 -04:00
Arokha Sieyes
3911e14936 tg(?) style stack autocombining 2020-05-17 00:47:42 -04:00
Aronai Sieyes
0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04: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
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Neerti
2f173dd16b Adds differing stack sprites 
Ports most of /tg/'s sprites for stacks displaying their contents.  I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
 2017-09-28 01:04:19 -04:00
Techhead0
deaac36479 Clicking a stack no longer transfers one sheet at a time. 2016-06-27 11:30:55 -05:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Hubblenaut
5baf93722a Fixes subcategories of floor tiles not being placable 2015-12-10 16:28:40 +01:00
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
PsiOmegaDelta
bd7c475fcc Stack material use now depends on charge costs. 
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
 2015-10-08 20:29:39 +02:00
PsiOmegaDelta
c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
 2015-08-24 10:23:12 +02:00
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00