cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,115 Commits 10 Branches 0 Tags
0854b83265e32dd4b6f60aa4fc1d7b88d123242a
Commit Graph

76 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
0854b83265 [MIRROR] more font tag replacements (#10264) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-01 23:52:41 +01:00
CHOMPStation2StaffMirrorBot
9ffe6f5fcb [MIRROR] cleans up some left over things (#10168) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-15 05:32:35 +01:00
CHOMPStation2StaffMirrorBot
fc21a0cb26 [MIRROR] ports tgui color input from bubbers (#9919) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-23 20:35:22 +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
16d5b45148 [MIRROR] intent cleanup (#9778) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-03 21:57:25 +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
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
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
14f0302bef [MIRROR] some more spans (#9170) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-06 06:59:27 +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
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
MeepleMuncher
d2c88c7340 Alternate Teppi Plushie (Wif Different Spritee) (#8832) 2024-08-26 13:40:41 +02:00
Guti
5a51008d06 Teppi Plush (#8816) 2024-08-23 00:09:58 +02:00
CHOMPStation2
3977bad5a9 [MIRROR] Fix for bait toy (#8811) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-08-22 12:42:48 +02:00
CHOMPStation2
cddbbd6298 [MIRROR] Monster Bait (#8667) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-07-22 15:37:29 +02:00
MeepleMuncher
734d93f841 Dragon Plushies! Part Deux (#8408) 2024-05-19 00:50:44 +02:00
MeepleMuncher
8a4956ae9a Dragon Plushies! (#8371) 2024-05-12 16:23:29 +02:00
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
Eli
2edc2faf5b Binder fixes (#7673) 2024-02-02 19:15:39 +01:00
CHOMPStation2
20da89c88f [MIRROR] ports blahaj (#6866) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-25 08:58:36 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
f0a0c6d506 Merge pull request #14880 from Youtubeboy139/Take-me-out-to-the-Ball-Game 
Take me out to the Ball Game
 2023-05-25 02:12:54 +00:00
RinPin
edaad07ea8 Adds green fox plushie! 
Adds a green fox plushie to the game and loadout. to go with the other colored fox plushies.
 2023-03-05 20:29:54 -03:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Casey
bfca16b709 Merge pull request #13728 from Novacat/nova-basicfixes 
Snowglobes
 2022-09-18 09:34:24 +00:00
Casey
59ea1de538 Merge pull request #13469 from Cameron653/plushie 
Makes you able to select the borg plushies
 2022-08-14 05:39:01 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
88df18c3a5 Merge pull request #12669 from GhostActual/aurora_toys 
Aurora Toys
 2022-04-06 08:29:25 +00:00
Nadyr
8f5bd593ba Merge branch 'master' into upstream-merge-12288 2022-02-19 20:48:23 -05:00
Casey
dc837b05b4 [ready] pastelprincedan plushie fluff item 2022-02-19 22:06:21 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Aronai Sieyes
0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311 
[MIRROR] Remove suicide act
 2021-10-28 00:49:05 +00:00
Rykka
ed798113d9 Compiler Fixes 
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
 2021-09-03 17:22:49 -07:00
Aronai Sieyes
c7a71bc599 Merge pull request #11497 from VOREStation/upstream-merge-8239 
[MIRROR] Makes Fumo Un-Huge
 2021-08-26 17:38:41 +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
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Aronai Sieyes
d7283c9011 Merge pull request #10823 from VOREStation/Icons/toys 
Some Eris toys, /tg/ mecha toy icons
 2021-07-03 20:44:10 +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
Aronai Sieyes
07cb7850ce Merge pull request #10535 from SpaceVampire/Chess 
Chessboard Holodeck TG-Style.
 2021-06-02 16:03:06 +00:00
Nadyr
24c35497ff powder that makes you say yes 2021-05-29 22:20:06 -04:00
Chompstation Bot
501f383da4 [MIRROR] Make figurines small instead of normal sized 2021-05-29 18:55:11 +00:00