cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-18 18:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,299 Commits 11 Branches 0 Tags
0265fa7d22afa01b161969d9bd4c38b119fa3ef2
Commit Graph
33763 Commits
Author SHA1 Message Date
CaseyandCHOMPStation2 0265fa7d22 Adjust Security Ticket 2022-11-22 01:20:48 +00:00
RazgrizandGitHub 99f0a27b9f Merge pull request #5283 from CHOMPStation2/upstream-merge-14107 
[MIRROR] Teshari screaming noise. *teshscream
 2022-11-20 20:37:20 -07:00
RazgrizandGitHub e731f1fce5 Merge pull request #5281 from CHOMPStation2/upstream-merge-13727 
Fixes Runtime with Admin Spice - Upstream merge 13727
 2022-11-20 20:36:20 -07:00
CaseyandCHOMPStation2 b1a0531b05 Merge pull request #14107 from tacoguy7765093/tesh-to-tesh-communication 
Teshari screaming noise. *teshscream
 2022-11-21 01:33:00 +00:00
CaseyandCHOMPStation2 f6cfa0a3ed Merge pull request #14093 from Very-Soft/equipspecial 
equip_special
 2022-11-18 06:39:56 +00:00
NadyrandGitHub 5d35b5b8a2 Merge pull request #5273 from CHOMPStation2/upstream-merge-14090 
[MIRROR] Update air_traffic.dm
 2022-11-17 20:10:18 -05:00
NadyrandGitHub 8dd19aaa90 Merge pull request #5271 from CHOMPStation2/upstream-merge-14087 
[MIRROR] Fixes comfy chair recipies being removed by broken mirror
 2022-11-17 20:09:14 -05:00
NadyrandGitHub 7cd8cb7905 Merge pull request #5268 from TheGreatKitsune/non-custom-blindness 
Allows blindness on non custom species
 2022-11-17 19:57:05 -05:00
CaseyandCHOMPStation2 0925e918bf Merge pull request #14090 from KillianKirilenko/kk-traffictweaks 
Update air_traffic.dm
 2022-11-17 02:38:14 +00:00
CaseyandCHOMPStation2 e9c0b6ee31 Merge pull request #14087 from Heroman3003/mirro-fixes 
Fixes comfy chair recipies being removed by broken mirror
 2022-11-17 02:33:55 +00:00
CaseyandCHOMPStation2 009d6604d0 Merge pull request #14083 from BonniePandora/Forb-Time 
Pandora's Fox-orb custom plush
 2022-11-17 02:31:44 +00:00
RazgrizandGitHub edc64dcbdf Merge pull request #4143 from Tasald/Explorationedits 
Explorationedits
 2022-11-14 23:54:29 -07:00
TheGreatKitsune 349ab7298b Allows blindness on non custom species 2022-11-15 00:15:31 -06:00
RazgrizandGitHub 4f530f8138 Update chat_commands.dm 2022-11-14 23:05:04 -07:00
RazgrizandGitHub 70e755fb4c Comment out var/map_name because we don't use it 
And it is causing a warning for the compiler.
 2022-11-14 23:01:57 -07:00
NadyrandGitHub 5ac990b857 Merge pull request #5264 from CHOMPStation2/upstream-merge-14077 
[MIRROR] Makes some species specific emotes general
 2022-11-14 22:24:44 -05:00
NadyrandGitHub c25043fe05 Merge pull request #5263 from CHOMPStation2/upstream-merge-14078 
[MIRROR] Xenochimera Fix for Numbing Fangs/Sharp Melee overriding Claws
 2022-11-14 22:00:57 -05:00
NadyrandGitHub 6a02517164 Merge pull request #5256 from CHOMPStation2/upstream-merge-14061 
[MIRROR] Species Alcohol Mod Cleanup
 2022-11-14 21:59:31 -05:00
NadyrandGitHub 1ecb7ae5d8 Merge pull request #5255 from CHOMPStation2/upstream-merge-14062 
[MIRROR] Adds sect drone taurhalves and wvag versions of existing fat taurs
 2022-11-14 21:59:16 -05:00
NadyrandGitHub e68bf8d494 powder that makes you say yes 2022-11-13 16:54:44 -05:00
NadyrandGitHub b981bafc41 powder that makes you say yes 2022-11-13 16:52:49 -05:00
NadyrandGitHub 880751037d Merge pull request #5262 from CHOMPStation2/upstream-merge-14069 
[MIRROR] AR-Bs Employment Records
 2022-11-13 16:51:59 -05:00
NadyrandGitHub d34a770c2f Merge pull request #5259 from CHOMPStation2/upstream-merge-14065 
[MIRROR] Fixes prommie glow
 2022-11-13 16:49:16 -05:00
NadyrandGitHub e9ce051107 powder that makes you say yes 2022-11-13 16:48:19 -05:00
NadyrandGitHub bb8d0a1b16 powder that makes you say yes 2022-11-13 16:45:39 -05:00
NadyrandGitHub 2aca844d23 Merge pull request #5254 from CHOMPStation2/upstream-merge-14052 
[MIRROR] Makes contaminated boxes not fall apart
 2022-11-13 16:36:14 -05:00
CaseyandCHOMPStation2 0feb73835c Makes some species specific emotes general 2022-11-13 20:50:30 +00:00
CaseyandCHOMPStation2 4c0885248c Xenochimera Fix for Numbing Fangs/Sharp Melee overriding Claws 2022-11-13 20:50:26 +00:00
CaseyandCHOMPStation2 72ea1567bf Merge pull request #14069 from KillianKirilenko/kk-glasses 
AR-Bs Employment Records
 2022-11-13 20:49:19 +00:00
CaseyandCHOMPStation2 9ccc5174fb Merge pull request #14065 from Heroman3003/prom-glow-fix 
Fixes prommie glow
 2022-11-13 20:48:04 +00:00
CaseyandCHOMPStation2 d9db1635d2 Species Alcohol Mod Cleanup 2022-11-13 20:46:48 +00:00
CaseyandCHOMPStation2 9057a53fd3 Adds sect drone taurhalves and wvag versions of existing fat taurs 2022-11-13 20:46:44 +00:00
CaseyandCHOMPStation2 2aa5d4d7c9 Merge pull request #14052 from Heroman3003/box-ungurgle 
Makes contaminated boxes not fall apart
 2022-11-13 20:45:36 +00:00
CaseyandCHOMPStation2 f70dc36da1 Merge pull request #14051 from Heroman3003/hedgetrim 
Makes hedge trimmers instakill vines
 2022-11-13 20:44:27 +00:00
RazgrizandGitHub fdc1fff93b Merge pull request #5180 from TheGreatKitsune/custom-species-emotes 
Add a bunch of emotes to custom species
 2022-11-10 13:04:15 -07:00
RazgrizandGitHub 987d99ad94 Merge pull request #5248 from Verkister/yumtastyearpieces 
Adds a verb to toggle headset icon visibility.
 2022-11-10 12:54:47 -07:00
RazgrizandGitHub f4712d4b3f Merge pull request #5160 from User-U-U/revertrobotshuttlechange 
Reverts a virgo PR that prevents borgs from using shuttles
 2022-11-10 12:51:52 -07:00
Verkister 36b0fb1d9f Adds a verb to toggle headset icon visibility. 
Adds a verb to IC tab that lets you hide/show headset sprite on your char. (Hella eyesore on large chars looking like someone stapled a whole-ass parking ticket on their cheek lmao)
Also fixes an indentation crime while at it.
 2022-11-10 15:24:47 +02:00
RazgrizandGitHub 94bdb1ed00 Merge pull request #5246 from Verkister/sprotstuff 
A small bundle of sprite accessory things
 2022-11-09 12:26:27 -07:00
VerkisterandGitHub 9c7ce66802 fixes loafing for waggy fatfeline 
honestly these two should be feline subtypes like the rest of the feline related taurs are.
 2022-11-09 19:55:03 +02:00
VerkisterandGitHub 79d9e11bf2 Update sprite_accessories_ear_ch.dm 2022-11-09 15:42:37 +02:00
Verkister d8a93c99ab A small bundle of sprite accessory things 
-Adds markings for thick neck (2 sizes and extra for throat coloring)
-Adds colorable versions of the troll horns that were never useful for anything else due to forced color.
-Fixes elf ears missing sprites (todo: upstream pr if i can be arsed to)
-Improves humanoid round gut marking shading contrast. (I was legit surprised that it even had any in the first place. always thought it was just flat while lmao)
 2022-11-09 15:35:32 +02:00
NadyrandGitHub 895addbf97 Merge pull request #5233 from CHOMPStation2/upstream-merge-14037 
[MIRROR] Fixes ahelp fullmonty runtime
 2022-11-07 18:42:45 -05:00
NadyrandGitHub caad6a468a Merge pull request #5232 from CHOMPStation2/upstream-merge-14038 
[MIRROR] remove xenoarch tools from mining vender
 2022-11-07 18:35:00 -05:00
NadyrandGitHub c6d7fd8e8d Merge pull request #5225 from CHOMPStation2/upstream-merge-14023 
[MIRROR] Removes crab claws, fixes belly tattoo
 2022-11-07 18:34:19 -05:00
NadyrandGitHub e3a012a292 Merge pull request #5224 from CHOMPStation2/upstream-merge-14025 
[MIRROR] Fixes two lobby bugs
 2022-11-07 18:34:07 -05:00
NadyrandGitHub 7a2a86fd12 Merge pull request #5237 from CHOMPStation2/upstream-merge-14046 
[MIRROR] Healing mobs aren't racist against all other simplemobs anymore
 2022-11-07 17:35:38 -05:00
NadyrandGitHub 4f71b736f7 Merge pull request #5235 from Verkister/sugmeblowme 
You know what? *unfucks your elevator lights*
 2022-11-07 17:34:48 -05:00
NadyrandGitHub 3041c872b4 powder that makes you say yes 2022-11-07 17:33:47 -05:00
NadyrandGitHub f0e281b4f7 powder that makes you say yes 2022-11-07 17:32:52 -05:00