cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,091 Commits 6 Branches 0 Tags
dba0bf4304a627d970d895fb7205fbd7245c0f94
Commit Graph

399 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
e957f101c5 [MIRROR] more new to Init (#10183) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-16 03:06:56 +01:00
CHOMPStation2StaffMirrorBot
499e8e7ee9 [MIRROR] removes center of mass list (#10081) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-07 15:08:58 +01:00
CHOMPStation2StaffMirrorBot
a8aec08612 [MIRROR] Glamour Experimentation (#10042) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-01 23:12:01 +01:00
CHOMPStation2StaffMirrorBot
a245b8687f [MIRROR] usr to user part two (#10015) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-31 22:27:34 +01:00
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-05 23:01:49 +01:00
CHOMPStation2StaffMirrorBot
d35faa5844 [MIRROR] Adds a new ghost vis blocking area flag (#9636) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-22 05:31:04 +01:00
CHOMPStation2StaffMirrorBot
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 02:11:06 +01:00
CHOMPStation2StaffMirrorBot
f7e9f8d12b [MIRROR] Ring/Watch Accessory Transfer (#9489) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-19 19:14:32 +01:00
CHOMPStation2
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
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
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
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
CHOMPStation2
8af60b24b9 [MIRROR] Replicant Species (#9049) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-27 23:46:00 +02:00
CHOMPStation2
de9edb8d50 [MIRROR] Tech tile fixes (#8752) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-08-11 18:58:13 -04:00
CHOMPStation2
a8f1fa8f2a [MIRROR] Craftable Shelves (#8751) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-08-10 07:37:31 +02:00
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
CHOMPStation2
c5d592fd77 [MIRROR] Fixes inconsistant material refunds and removes material cost from door repair (#8215) 
Co-authored-by: Reo Lozzot <84661000+ReoDaProtovali@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-17 09:34:18 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
379e34217c [MIRROR] dismantle takes optional var (#7677) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-02-02 19:16:19 +01:00
CHOMPStation2
7f4274a2d8 [MIRROR] porting healthbars from roguestar + disassemble mat fixes (#7649) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-01-31 11:55:21 -05:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
CHOMPStation2
fc584152e3 [MIRROR] we never want half or empty stacks (#7639) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-28 15:59:39 +01:00
CHOMPStation2
a4280d14e1 [MIRROR] Many bug fixes, QoL, and PDA notes port (now with sensible diffs) (#7588) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Nadyr <forlirnglacignis@gmail.com>
 2024-01-19 09:26:26 -05:00
CHOMPStation2
2c6276cc8b [MIRROR] Graphite Table Material (#7456) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-21 23:11:41 +01:00
Aroliacue
8dc3f411a2 Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336) 2023-12-06 21:31:18 +01:00
CHOMPStation2
9a0a9ca329 [MIRROR] Hardwood Parquet (#7236) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-11-17 20:22:15 +01:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
Verkister
9583cd46fa Fixes cloth and fiber materials missing their sheet type definitions (#6945) 2023-09-10 09:48:24 +02:00
CHOMPStation2
1e0cbdc713 [MIRROR] Wall/Table Icon_Base Split (+hull plating creation) (#6933) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-08 14:11:17 +02:00
Aroliacue
807619a6bd Xenomorph Hybrids species (#6893) 2023-09-01 10:04:37 +02:00
CHOMPStation2
c3d1fd6128 [MIRROR] Staves (#6684) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-30 16:16:00 +02:00
Heroman3003
ee8c705e3a Merge pull request #15156 from Heroman3003/fluffstuff 
Fluff updates
 2023-07-18 05:21:35 +00:00
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Casey
7b62bb9d2a Merge pull request #14617 from TheToaster98/ErisFloors 
Allows the crafting of Eris-style floors
 2023-03-08 19:07:31 +00:00
Heroman3003
7717c49c87 Merge pull request #14565 from Heroman3003/atuolaathe 
Fixes hull-made items putting hull materials in my autolathe
 2023-02-26 09:46:09 +00:00
Razgriz
fed8c75408 Fix plastic feeder recipe so that it isn't under sofas (#5610) 
* Fix plastic feeder recipee so that it isn't under sofas

* Update plastic_ch.dm

* god please
 2023-01-26 02:02:40 -07:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Casey
e9c0b6ee31 Merge pull request #14087 from Heroman3003/mirro-fixes 
Fixes comfy chair recipies being removed by broken mirror
 2022-11-17 02:33:55 +00:00
Bib Bob
c854be9fae can I have a sheet on my bed 2022-11-05 18:51:20 -05:00
Razgriz
cf301c6346 [Manual MIRROR] Release Bugfixes and changes (MERGE BEFORE RELEASE) 
Unfucks https://github.com/CHOMPStation2/CHOMPStation2/pull/5019 due to yet another github merge conflict with a god damn .dmi file. Missing map files, but that's ok because that's for virgo specific maps.
 2022-09-23 00:14:16 -07:00
Razgriz
fa6ecc5cee Merge pull request #5004 from CHOMPStation2/upstream-merge-13467 
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
 2022-09-22 22:10:59 -07:00
Razgriz
983fb72a3f powder that makes you say yes 2022-09-22 21:03:29 -07:00
Razgriz
69883123d9 powder that makes you say yes 2022-09-22 21:03:08 -07:00
VirgoBot
a3c824dcc8 [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010) 
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:08:46 +00:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +00:00
Casey
5c9f7b6b72 Merge pull request #13349 from Heroman3003/frame-parts 
Makes multiple frame parts makeable on same tile
 2022-07-17 09:32:41 +00:00
Novacat
ecf195e93d Merge pull request #13228 from Heroman3003/unbucket 
Removes wooden bucket recipe from planks
 2022-07-01 21:25:10 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Razgriz
28c173e92b revert morphium nerf 2022-04-10 13:26:26 -07:00