cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 18:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,438 Commits 8 Branches 0 Tags
b98140bc06cf4c888fe68593cbb493bb5255e839
Commit Graph

331 Commits

Author SHA1 Message Date
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
Eli
45f4dcf2a6 Item TF interactions with mob cubes and cigarettes (#9508) 2024-11-20 21:03:23 +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
CHOMPStation2StaffMirrorBot
6eafc8c9d0 [MIRROR] maptest redgate (#9462) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-10 06:22:45 +01:00
CHOMPStation2StaffMirrorBot
3f79b7c336 [MIRROR] Makes ashtrays visible in SDMM (#9428) 
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2024-11-06 19:21:10 +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
Kashargul
a92a42b85b converts our spans (#9185) 2024-10-07 20:47:23 +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
CHOMPStation2
70b226e6ac [MIRROR] some RS ports (#8790) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-08-16 00:43:14 +02:00
CHOMPStation2
f172e1f5b3 [MIRROR] even more local defines (#8516) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-14 08:28:10 +02:00
CHOMPStation2
5de290e32a [MIRROR] Reduces ashtray size (#8421) 
Co-authored-by: DigitalSquirrel95 <48812209+DigitalSquirrel95@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-05-21 21:19:14 +02: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
7f4274a2d8 [MIRROR] porting healthbars from roguestar + disassemble mat fixes (#7649) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-01-31 11:55:21 -05:00
CHOMPStation2
a4280d14e1 [MIRROR] Many bug fixes, QoL, and PDA notes port (now with sensible diffs) (#7588) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Nadyr <forlirnglacignis@gmail.com>
 2024-01-19 09:26:26 -05:00
FluffMedic
08e7b6658b 1 real fix, two bandaid ones. (#7270) 2023-11-25 13:53:46 +01: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
9d2f15e494 [MIRROR] Adds food vore (#6858) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-23 15:13:38 +02:00
CHOMPStation2
4d062e3139 [MIRROR] Staves Mini-Tweak (#6688) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-31 08:49:23 +02:00
CHOMPStation2
c3d1fd6128 [MIRROR] Staves (#6684) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-30 16:16:00 +02:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Heroman3003
b2a1fbeecd Merge pull request #14198 from VOREStation/upstream-merge-8853 
[MIRROR] Fixes shards having unlimited afterattack range
 2022-12-13 22:08:55 +00:00
Casey
8a0aef53f8 Merge pull request #13658 from Heroman3003/stackruntime 
fixes runtime with stack dna transfer
 2022-09-04 21:50:22 +00:00
Nadyr
a507a21424 powder that makes you say yes 2022-07-19 20:50:10 -04:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +00:00
Kassc
9d620f4096 Merge pull request #4329 from VictorZisthus/majormapedits 
Massive Broad Scope Changes
 2022-07-13 19:02:32 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Victor Zisthus
aca04e1d65 Runtime Fix attempt 2 2022-06-06 14:02:45 -04:00
Victor Zisthus
45aaffb4fb Runtime fix 
Probably. Unit tests will tell.
 2022-06-06 13:23:29 -04:00
Casey
b9f0c0ef92 Late Night Stuff 2022-04-17 09:21:02 +00:00
Razgriz
100e98e9bc no 2022-03-27 15:17:28 -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
Casey
b721da62a1 A more elegant weapon from a more civlised age 2022-02-27 19:27:52 +00:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13: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
Aronai Sieyes
0f6e69f344 Merge pull request #11533 from VOREStation/upstream-merge-8236 
[MIRROR] Allows wiping food off cutlery
 2021-10-22 17:52:40 +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
Nadyr
806ec66e59 powder that makes you say yes 2021-08-27 21:09:01 -04:00
Nadyr
b7894c7332 pwoder that makes you say yes 2021-08-27 21:08:38 -04:00
Nadyr
8d54859a25 Merge branch 'master' into upstream-merge-11432 2021-08-27 21:08:12 -04:00
Nadyr
e20ed23ac0 powder that makes you say yes 2021-08-27 20:05:30 -04:00
Nadyr
3287536c76 powder that makes you say yes 2021-08-27 20:05:01 -04:00
Nadyr
072983120b powder that makes you say yes 2021-08-27 20:04:18 -04:00