cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
80,514 Commits 10 Branches 0 Tags
tracy
Commit Graph
2733 Commits
Author SHA1 Message Date
BlackMajor 6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
NadyrandGitHub 970000bbc4 Merge pull request #3486 from CHOMPStation2/upstream-merge-12004 
[MIRROR] Limits painting name length to 250 characters
 2021-12-12 06:44:23 -05:00
NadyrandGitHub 1141e96505 Merge pull request #3295 from CHOMPStation2/upstream-merge-11975 
[MIRROR] Door Interact Tweaks
 2021-12-12 06:28:53 -05:00
NadyrandGitHub dfdf720ee9 Merge pull request #3301 from CHOMPStation2/upstream-merge-11968 
[MIRROR] Allows simplemobs climb ladders + trash pile interaction fix
 2021-12-12 06:22:42 -05:00
CaseyandDarlantan 5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
NadyrandGitHub bf5f98c728 Merge pull request #3427 from CHOMPStation2/upstream-merge-11815 
[MIRROR] Adds catslug to maintpred options
 2021-12-12 04:13:27 -05:00
NadyrandGitHub 62921c7b1a Merge pull request #3401 from CHOMPStation2/upstream-merge-11779 
[MIRROR] Fixes infinite glass from low walls
 2021-12-12 02:00:08 -05:00
CaseyandChompstation Bot 2c122a8822 Merge pull request #12004 from Heroman3003/paintname-limit 
Limits painting name length to 250 characters
 2021-12-11 13:55:38 +00:00
RazgrizandGitHub af8834894b powder that makes you say yes 2021-12-10 00:55:04 -07:00
CaseyandChompstation Bot 3d3fc07d0e Merge pull request #11877 from Heroman3003/glovening 
Adds leather gloves to (xeno)botanist lockers
 2021-12-10 06:12:10 +00:00
CaseyandChompstation Bot afcf943138 Adds catslug to maintpred options 2021-12-10 01:08:04 +00:00
CHOMPStation2andGitHub 8324777d6e Powder that makes you say yes 2021-12-09 14:16:10 -07:00
CaseyandChompstation Bot 2047a923b2 Merge pull request #11968 from Heroman3003/simplemob-clickfix 
Allows simplemobs climb ladders + trash pile interaction fix
 2021-12-08 04:18:02 +00:00
CaseyandChompstation Bot 90c9ef5f3f Door Interact Tweaks 2021-12-08 04:17:15 +00:00
BlackMajor dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
NadyrandGitHub 1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
NadyrandGitHub cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
CaseyandChompstation Bot fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
NadyrandGitHub 19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722 
[MIRROR] Hardwood Material Port
 2021-10-30 23:30:40 -04:00
Chompstation Bot da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Chompstation Bot 60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
NadyrandGitHub e04d6162fc Merge pull request #3095 from CHOMPStationBot/upstream-merge-11544 
[MIRROR] [MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
 2021-10-22 19:51:36 -04:00
NadyrandGitHub 024c8d1dd0 Merge pull request #3090 from CHOMPStationBot/upstream-merge-11535 
[MIRROR] Misc additions I made while sleep deprived
 2021-10-22 19:46:46 -04:00
Aronai SieyesandChompstation Bot f2702c5455 Merge pull request #11544 from VOREStation/upstream-merge-8230 
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
 2021-10-22 18:24:49 +00:00
Ghost ActualandChompstation Bot 91fc1bd364 Misc additions I made while sleep deprived (#11535) 
* Base Commit

* Small Fix

* Small Fix

* Small Fix
 2021-10-22 17:49:28 +00:00
Verkister 2bccef7423 adds double upstreams too 2021-10-22 17:23:07 +03:00
NadyrandGitHub 53c15bd4f3 powder that makes you say yes 2021-09-28 23:41:35 -04:00
Chompstation Bot a7365de5be Eng/Med Belts 2021-09-29 02:41:07 +00:00
NadyrandGitHub 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
NadyrandGitHub ed2c4b3309 powder that makes you say yes 2021-09-27 17:51:06 -04:00
Chompstation Bot ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Chompstation Bot 564efa888d Doors: Now With 100% More Politeness 2021-09-27 18:16:10 +00:00
Chompstation Bot 4dd3ea4d15 Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-09-24 03:19:02 +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
NadyrandGitHub 0ccc8cf78e powder that makes you say yes 2021-08-27 20:07:14 -04:00
NadyrandGitHub be5b7f3644 Merge pull request #2895 from CHOMPStationBot/upstream-merge-11466 
[MIRROR] Expanding Clothing Options
 2021-08-26 20:50:04 -04:00
NadyrandGitHub cecfa38e2b Merge pull request #2913 from CHOMPStationBot/upstream-merge-11499 
[MIRROR] [MIRROR] Ports sliding things along tables
 2021-08-26 20:49:20 -04:00
NadyrandGitHub 38b64164ae Merge pull request #2900 from CHOMPStationBot/upstream-merge-11493 
[MIRROR] [MIRROR] Sleep Tight Disky
 2021-08-26 20:42:32 -04:00
Aronai SieyesandChompstation Bot 99d4db145d Merge pull request #11499 from VOREStation/upstream-merge-8233 
[MIRROR] Ports sliding things along tables
 2021-08-26 20:17:48 +00:00
Aronai SieyesandChompstation Bot 46c1fc90d1 Merge pull request #11493 from VOREStation/upstream-merge-8241 
[MIRROR] Sleep Tight Disky
 2021-08-26 16:53:03 +00:00
Chompstation Bot 3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
NadyrandGitHub 145f8172f4 Merge pull request #2843 from CHOMPStationBot/upstream-merge-11464 
[MIRROR] Stun Revolver Fix
 2021-08-25 23:42:35 -04:00
NadyrandGitHub 454b7c25db Merge pull request #2889 from CHOMPStationBot/upstream-merge-11483 
[MIRROR] Adds the ability to ban people from ghost roles
 2021-08-25 23:38:36 -04:00
NadyrandGitHub 67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
NadyrandGitHub f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421 
Merge Upstream Pull Request 11421
 2021-08-25 22:38:53 -04:00
NadyrandGitHub 779c8ab9e6 Merge pull request #2869 from cadyn/upstream-merge-11412 
Merge Upstream Pull Request 11412
 2021-08-25 22:01:13 -04:00
NadyrandGitHub 0d3076d6b4 Merge pull request #2867 from cadyn/upstream-merge-11408 
Merge Upstream Pull Request 11408
 2021-08-25 21:59:52 -04:00
NadyrandGitHub e0b3a41696 powder that makes you say yes 2021-08-25 21:46:16 -04:00
NadyrandGitHub e142d328ee powder that makes you say yes 2021-08-25 21:43:39 -04:00