cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,866 Commits 5 Branches 0 Tags
fe7e122a19ab06b43aa142cf6463c8c20bf304fe
Commit Graph

1080 Commits

Author SHA1 Message Date
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
CHOMPStation2
234aed941f [MIRROR] fix some runtimes and an overlay overflow (#8210) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-11 07:47:45 +02:00
Guti
172e1c7c12 Balloon Alerts (#7877) 2024-03-15 07:40:14 +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
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
5ecc743ce5 [MIRROR] robot upgrade overhaul + some fixes (#7640) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.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: Changelogs <action@github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-31 12:55:35 -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
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
CHOMPStation2
507879aef8 [MIRROR] Fantasy redgate map (#7035) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:29:35 +02:00
CHOMPStation2
5b3676c2af [MIRROR] fix(bloodpills): Fixes path (#6962) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-12 23:20:41 +02:00
CHOMPStation2
58891b3e78 [MIRROR] Changes blood regen pill instances to contain copper pills due to zorren copper update (#6958) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
 2023-09-12 23:19:36 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +02:00
Raeschen
071905fed5 Fix lost changes (#6633) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 08:44:40 +02:00
kcin2001
748b2f4fec misc borg fixes 2023-07-11 23:38:12 -07:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 
[MIRROR] Little Weakref Refactor
 2023-06-09 22:27:56 -04:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
24dae674d0 Merge pull request #14930 from Heroman3003/harminject-buff 
Buffs harm-injection
 2023-06-01 20:35:45 +00:00
Verkister
88f23977a6 Fixes gender chem kits 
Un-oopsie-poopsied the funny chemnames that runtimed and bricked the whole kits
 2023-01-03 18:46:46 +02:00
Novacat
56f0906618 Merge pull request #14224 from Heroman3003/cream 
Gives service borgs some cream
 2022-12-22 02:29:42 +00:00
Casey
0ec934b863 Merge pull request #13900 from Cameron653/syringe_overlay 
Fixes an oversight with syringes.
 2022-10-16 21:04:00 +00:00
Darlantan
06bd861d57 First "let's back up my work somewhere other than my HDD" commit 2022-09-25 17:54:03 -04:00
Razgriz
64a7d9a36d Merge pull request #5010 from CHOMPStation2/upstream-merge-12971 
[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)
 2022-09-22 22:17:43 -07:00
Razgriz
a6f9014496 powder that makes you say yes 2022-09-22 21:50:36 -07:00
Casey
de491df7b7 Radiation Rework 2022-09-23 00:56:28 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Razgriz
0ce7af1fd9 Merge pull request #4145 from TheGreatKitsune/hypospray_size 
Adjust hypospray size. (Fixes #4097)
 2022-04-28 13:52:44 -07:00
Casey
8679260347 Merge pull request #12819 from GhostActual/powder_drugs 
Pharma Fix
 2022-04-24 07:17:44 +00:00
TheGreatKitsune
084dfb05c4 Adjust hypospray size. 2022-04-23 20:42:11 -05:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
a6e052cc9b Hypospray Revamp 2022-04-04 18:29:52 -04:00
Razgriz
861646f4b4 no 2022-03-27 15:20:12 -07:00
Casey
61c0ddf399 Makes engraving no-longer cause rage when trying to cut wires, amongst other things. 2022-03-27 19:00:28 +00:00
Razgriz
de4cc762f1 powder that makes you say yes 2022-02-16 14:40:09 -07:00
Casey
fdfa958555 Adds vendor refill cartridges to cargo 2022-02-14 21:36:39 +00:00
Aronai Sieyes
12d8d8f592 Merge pull request #11681 from VOREStation/upstream-merge-8326 
[MIRROR] You can't feed drinks to borgs
 2021-10-28 01:25:13 +00:00
Chompstation Bot
3caad465fa the part printing buff nobody asked for 2021-10-27 21:05:26 -04:00
Casey
35d62f6ea7 Merge pull request #11582 from PastelPrinceDan/autoinjectors 
Adds large autoinjectors to autolathes
 2021-09-24 03:55:25 +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
Novacat
827f9ebbbf Merge pull request #11477 from VOREStation/upstream-merge-8223 
[MIRROR] Updates wine reagent id to redwine.
 2021-08-24 23:57:24 +00:00
Chompstation Bot
84d54d6c4e [MIRROR] Chemsprayer Update 2021-07-25 00:27:57 +00:00
Aronai Sieyes
977f422509 Merge pull request #11154 from VOREStation/Arokha/supervial 
Supermatter vial
 2021-07-19 22:23:52 +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
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Razgriz
1a3c753f4a Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802 
[MIRROR] Port several foods and food sprites
 2021-07-03 14:49:34 -07:00
Aronai Sieyes
67e370b0cf Merge pull request #10800 from VOREStation/Icons/chemistry 
Swap chemmaster, port beaker sprites
 2021-07-03 20:31:14 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00