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
79,670 Commits 10 Branches 0 Tags
fc21a0cb2685d3aa7ddb097eea6e22a180ea5177
Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
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
Eli
2edc2faf5b Binder fixes (#7673) 2024-02-02 19:15:39 +01:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00: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
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
kcin2001
7251099263 adds sif and station toy (reduces size of action figs too) 
adds a sif toy and station toy, added to relevant sources and reduces size of action figures because they did not need to be so big
 2021-03-05 01:15:58 -08:00
Verkister
b7f4c2192c Merge pull request #9253 from VOREStation/upstream-merge-7748 
[MIRROR] Adds new balloons
 2020-10-27 08:17:38 +00:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04: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