cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-17 21:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,259 Commits 19 Branches 0 Tags
f58a3c742bdff8affc266ab45ede9780ccbd4025
Commit Graph

6101 Commits

Author SHA1 Message Date
Casey
f58a3c742b Merge pull request #11881 from Heroman3003/grenadefix2 
Fixes infinite detonators being attachable to grenades
 2021-12-10 06:14:38 +00:00
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928 
[MIRROR] Offmap Tweaks
 2021-12-05 14:04:20 -05:00
Nadyr
db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921 
[MIRROR] Snakes are Sweet
 2021-12-05 13:28:39 -05:00
Nadyr
4efe4d49ef powder that makes you say yes 2021-12-05 12:53:32 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
46e29ec6b6 powder that makes you say yes 2021-12-05 10:52:16 -05:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Chompstation Bot
0851b4f14c Takes Stellar Delight apart 2021-11-01 21:58:31 +00:00
Nadyr
4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615 
[MIRROR] [MIRROR] Remove suicide act
 2021-10-27 21:05:48 -04: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
Nadyr
589b2d4024 Merge pull request #3152 from CHOMPStationBot/upstream-merge-11663 
[MIRROR] [WIP] Atmospheric Retention Fields
 2021-10-27 20:42:28 -04:00
Nadyr
2b394a1bf0 Merge pull request #3141 from CHOMPStationBot/upstream-merge-11705 
[MIRROR] Brainfood
 2021-10-27 20:17:28 -04:00
Nadyr
1664d87d43 Merge pull request #3143 from CHOMPStationBot/upstream-merge-11708 
[MIRROR] wacky haphazardly barely thought through standing drill buffs
 2021-10-27 19:26:22 -04:00
Nadyr
3928831eac Merge pull request #3133 from CHOMPStationBot/upstream-merge-11679 
[MIRROR] Restricts candle boxes to only hold candles
 2021-10-27 19:23:21 -04:00
Nadyr
0a973e2ddd Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698 
[MIRROR] Tool Time (Fixed)
 2021-10-27 19:14:36 -04:00
Nadyr
033a33f739 powder that makes you say yes 2021-10-27 19:07:24 -04:00
Chompstation Bot
536a6cb6e7 [WIP] Atmospheric Retention Fields 2021-10-27 18:39:20 +00:00
Casey
776f39486a Merge pull request #11708 from Hatterhat/drill-buffs 
wacky haphazardly barely thought through standing drill buffs
 2021-10-27 16:10:30 +00:00
Chompstation Bot
4a5b2182c1 Brainfood 2021-10-27 16:07:14 +00:00
Chompstation Bot
0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Chompstation Bot
21ad9c1e79 Restricts candle boxes to only hold candles 2021-10-27 15:41:48 +00:00
Casey
66c2269642 Merge pull request #11670 from VOREStation/upstream-merge-8329 
[MIRROR] Unequipping mask slot won't disable internals when wearing airtight hats
 2021-10-27 15:38:01 +00:00
Aronai Sieyes
33deecbad3 Merge pull request #11589 from VOREStation/upstream-merge-8293 
[MIRROR] Adds multitools to roboticist/engi toolbelts
 2021-10-25 00:05:02 +00:00
Nadyr
fa2d92ccae Merge pull request #3091 from CHOMPStationBot/upstream-merge-11533 
[MIRROR] [MIRROR] Allows wiping food off cutlery
 2021-10-22 19:47:13 -04: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
Verkister
0dcff8498b Earlyports all my current upstream open PRs 
hngh it's been months
 2021-10-22 17:11:58 +03:00
Djvoid225
762a40ad45 adds //CHOMPedit to tank_types edit 2021-10-09 15:53:24 -04:00
Djvoid225
564e32e082 fixes roundstart nitrogen tanks. 
Makes nitrogen tanks completely full roundstart, so vox aren't stuck with only their pocket tank.
 2021-10-03 14:29:28 -04:00
Nadyr
7737c7ccf1 Merge pull request #3048 from CHOMPStationBot/upstream-merge-11546 
[MIRROR] Adds more clothing from Polaris and various sources
 2021-09-27 18:37:17 -04:00
Chompstation Bot
2d2fa36094 [MIRROR] Fixes stray bugs 2021-09-27 18:46:27 +00:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Nadyr
f90573b3d2 Merge pull request #3014 from CHOMPStationBot/upstream-merge-11566 
[MIRROR] Adds randpixel to vore eggs.
 2021-09-24 17:06:04 -04:00
Nadyr
1df7f47c3b Merge pull request #3013 from CHOMPStationBot/upstream-merge-11562 
[MIRROR] Medical and utility belts of holding
 2021-09-24 17:05:40 -04:00
Nadyr
771a97f8d1 Merge pull request #3010 from CHOMPStationBot/upstream-merge-11557 
[MIRROR] [MIRROR] Expands the material values of certain items.
 2021-09-24 17:03:29 -04:00
Nadyr
0968d405f2 Merge pull request #3004 from CHOMPStationBot/upstream-merge-11554 
[MIRROR] [MIRROR] Removes an empty file. No clue what's the deal with this.
 2021-09-24 17:00:27 -04:00
Casey
23bcc0e69c Merge pull request #11566 from Verkister/patch-82 
Adds randpixel to vore eggs.
 2021-09-24 03:48:56 +00:00
Casey
38f2a0b96a Merge pull request #11562 from PastelPrinceDan/belts 
Medical and utility belts of holding
 2021-09-24 03:47:47 +00:00
Casey
ff47d21f04 Merge pull request #11557 from VOREStation/upstream-merge-8252 
[MIRROR] Expands the material values of certain items.
 2021-09-24 03:45:24 +00:00
Casey
fbafbbd06b Merge pull request #11554 from VOREStation/upstream-merge-8267 
[MIRROR] Removes an empty file. No clue what's the deal with this.
 2021-09-24 03:39:35 +00:00
Casey
ae13ff1ed2 Merge pull request #11524 from GhostActual/boxed 
Boxing Day
 2021-09-24 03:21:13 +00:00
Razgriz
6a67fffe52 powder that makes you say yes 2021-09-16 03:15:37 -07: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
Anthony Rodriguez
15dd652d8b Updating to reflect proper CHOMPEdit and nesting 2021-08-30 18:19:30 -07:00
Anthony Rodriguez
be2e0a0609 Altevian & Squeakish Language and ATC Addition. 2021-08-30 14:52:43 -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
3a9ff8e406 powder that makes you say yes 2021-08-27 20:53:01 -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