cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 07:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,985 Commits 10 Branches 0 Tags
896094ef9c3b63037aedba786debb6a2ed859a29
Commit Graph

40 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
f7de0bb70b [MIRROR] Start of TG Click Code Port (#12071) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-12-06 03:18:32 -05:00
CHOMPStation2StaffMirrorBot
2738c2c020 [MIRROR] Modernizing doors (#11728) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-09-23 17:24:13 -04:00
CHOMPStation2StaffMirrorBot
9e91e9017e [MIRROR] Dragon Plushie Upport (#11700) 
Co-authored-by: MeepleMuncher <76881946+MeepleMuncher@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-20 00:22:59 +02:00
CHOMPStation2StaffMirrorBot
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
CHOMPStation2StaffMirrorBot
8d29707485 [MIRROR] Removes some simple sleeps (#11527) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-08-29 23:49:16 +02:00
CHOMPStation2StaffMirrorBot
bb70ca1093 [MIRROR] Icon Fixup [IDB IGNORE] (#11451) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-08-17 20:03:49 -04:00
CHOMPStation2StaffMirrorBot
2c9453b5c3 [MIRROR] var/global/list -> GLOB. conversion (#11193) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-07-16 00:24:42 +02:00
CHOMPStation2StaffMirrorBot
f04f992cfe [MIRROR] code/global.dm => code/_global_vars/ (#10689) 
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-04-21 19:16:48 +02:00
CHOMPStation2StaffMirrorBot
5b75a6d3a2 [MIRROR] Fluff item for digitalsquirrel (#10558) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
 2025-03-30 22:26:54 +02:00
CHOMPStation2StaffMirrorBot
16a213f699 [MIRROR] Have you bingled that (#10545) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-29 22:12:53 +01:00
CHOMPStation2StaffMirrorBot
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
CHOMPStation2StaffMirrorBot
8044a7ffa2 [MIRROR] Plushie Fixes & Additions (#10351) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-03-11 23:26:52 +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
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
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
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
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
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
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
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00: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
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
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Nadyr
c1e068bd90 Update toys_vr.dm 2021-05-08 08:29:58 -04:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Chompstation Bot
d96a127b4a Ports Vox Plushie from Paradise 2020-12-26 01:59:20 +00:00
Rykka
a5fc9d81ce Adds Mech Toy Battles! 
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
 2020-08-12 04:31:00 -04:00