cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 03:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,438 Commits 9 Branches 0 Tags
b98140bc06cf4c888fe68593cbb493bb5255e839
Commit Graph

120 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
65b20a4d5c [MIRROR] Virology Hotfix #5 (#9620) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 14:08:06 +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
d3976b78a3 [MIRROR] Virology Update 1 (#9586) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 13:26:58 +01:00
CHOMPStation2StaffMirrorBot
e7e1ebaa1f [MIRROR] Hand implants can go in hands (#9543) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2024-11-28 08:08:10 +01:00
CHOMPStation2StaffMirrorBot
f72f2f8c89 [MIRROR] Server maint subsystem (#9408) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-04 22:00:41 +01:00
Selis
026253a175 upstream-merge-16484 [MDB IGNORE] (#9289) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-25 21:39:18 +02:00
CHOMPStation2
608075a2ae [MIRROR] Fix a small runtime in actions when dropping rigs (#9271) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-10-20 19:39:17 +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
Verkister
c38bbf3115 Fixes synth eye color verb (#8528) 2024-06-15 01:23:14 +02:00
CHOMPStation2
15863e00f8 [MIRROR] Undefines local defines and moves global to __define (#8502) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-09 18:26:41 +02:00
Kashargul
e28fa96705 Tg panel patch 2 (#8085) 
Co-authored-by: Cadyn Bombaci <cadynspacetechguy@gmail.com>
 2024-05-15 13:42:13 +02:00
Selis
e1a987c25c Configuration Controller (#7857) 2024-04-05 07:44:20 +02:00
Raeschen
615004fb01 Oocpaneledit 2 (Copy of #7713) (#7763) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-02-16 11:48:34 +01:00
Aroliacue
213a952c4a Exploration Equipment Vendors and misc changes (#7616) 2024-01-28 18:25:39 -05:00
Eli
270f533fcc Item TF device: Mind Binder (#7569) 2024-01-28 18:17:21 -05:00
CHOMPStation2
18e7eae7fa [MIRROR] FBP heatsink rebalance (#7641) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-28 18:09:19 -05: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
cd5813d748 Adds 2 new taur bellysprites, fixes 2 vorgan overlay bugs, and adds verb to toggle synth stomach reagent draining. (#7055) 2023-10-04 17:56:45 -04:00
CHOMPStation2
d658d29346 [MIRROR] OOC notes panel (#6767) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-11 14:25:41 +02:00
Bib Bob
f7996e87b8 Makes most implants craftable 2023-04-12 12:26:51 -05:00
Heroman3003
eb6dbedbbc Merge pull request #14291 from VOREStation/upstream-merge-8867 
[MIRROR] fixes augment implants so you can't spam the fuck out of them
 2023-01-03 06:54:31 +00:00
Heroman3003
0c95418e2a Merge pull request #13623 from VOREStation/upstream-merge-8696 
[MIRROR] Checks the no_clone modifier stored in DNA records as a path
 2022-09-10 21:03:04 +00:00
Casey
21e1032369 Merge pull request #13437 from Cameron653/Less_Letal_Lungs 
Less Lethal Lung Damage.
 2022-08-07 19:35:54 +00:00
Casey
28e6c99c5e Merge pull request #12505 from GhostActual/New-Alien-Organs 
New Alien Organ Sprites
 2022-03-22 03:01:08 +00:00
Casey
973135795d Merge pull request #12461 from Heroman3003/protean-food 
Adjustments to synthetic food processing
 2022-03-20 03:13:33 +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
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
a06e872c51 Tweak synth stuff 2021-05-11 22:04:18 +00:00
Nadyr
0f2b8e57a4 Merge pull request #1880 from CHOMPStationBot/upstream-merge-10248 
[MIRROR] [MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-09 07:39:11 -04:00
Chompstation Bot
ca996648dd [MIRROR] Oops, I refactored Chemistry! 2021-05-08 23:59:34 -04:00
Novacat
0292d2071c Merge pull request #10248 from VOREStation/upstream-merge-8058 
[MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-05 18:45:19 +00:00
Nadyr
a66d37daee Merge pull request #1453 from CHOMPStationBot/upstream-merge-9814 
[MIRROR] [MIRROR] Adds the Restraining Bolt.
 2021-03-04 03:53:12 -05:00
Novacat
5be7ddc486 Merge pull request #9837 from Novacat/nova-pathfinder 
Earlyports Stair fix from Polaris
 2021-03-02 22:28:01 +00:00
Novacat
7f7c5873d6 Merge pull request #9814 from VOREStation/upstream-merge-7820 
[MIRROR] Adds the Restraining Bolt.
 2021-02-28 23:16:43 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
15f5770983 Merge pull request #9724 from Novacat/nova-basicfixes 
Earlyports Polaris Fixes
 2021-02-15 22:48:27 +00:00
cadyn
2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
Cadyn
4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
Novacat
57e1be6caa Merge pull request #9598 from Heroman3003/defibfix 
Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:34:15 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
fd563559ad Merge pull request #9077 from VOREStation/upstream-merge-7668 
[MIRROR] Actually commit the reagent cycler's entire gimmick.
 2020-09-21 14:06:14 -04:00
Atermonera
d0fd1df327 Merge pull request #7668 from Mechoid/ReagentCyclingCycler 
Actually commit the reagent cycler's entire gimmick.
 2020-09-21 12:48:24 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Cyantime
78ec7a7733 Fix promethean revival flavor text and OOC notes 2020-08-05 05:26:03 -04:00