cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,827 Commits 5 Branches 0 Tags
adcd22c09d9975edf4ca9810996fe766be1ffcdc
Commit Graph

70827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
adcd22c09d Merge pull request #4722 from AnymousUnknow/master 
hide_body_part flags for markings, with supplied abnormal bodytype markings.
 2022-08-28 17:54:20 -04:00
Nadyr
eb55c960fd Merge pull request #4735 from CHOMPStation2/upstream-merge-13537 
[MIRROR] Fixes teshari Site Manager cloak being for nonexistant job of Facility Director
 2022-08-25 18:49:32 -04:00
Razgriz
c8c61b1880 Merge pull request #4768 from CHOMPStation2/Razgriz1032-patch-11 
Adjust TGS stats's AFK
 2022-08-23 12:29:18 -07:00
Razgriz
af2379b0c7 Adjust TGS stats's AFK 2022-08-23 12:13:16 -07:00
Razgriz
4d79f69630 Merge pull request #4759 from TheGreatKitsune/carbonkin-death 
Shadekin eject belly contents when dying
 2022-08-22 09:45:03 -07:00
Razgriz
4bcbf619d5 Merge pull request #4754 from CHOMPStation2/upstream-merge-13543 
[MIRROR] Allows painkillers to negate slowdown due to damage
 2022-08-22 09:44:04 -07:00
TheGreatKitsune
6b13714f89 Shadekin eject belly contents when dying 2022-08-21 15:27:53 -05:00
CHOMPStation2
6fa780b94c Allows painkillers to negate slowdown due to damage 2022-08-21 19:42:18 +00:00
Casey
af1f3c2de4 Merge pull request #13543 from Cameron653/OWIE_SLOWDOWNIE 
Allows painkillers to negate slowdown due to damage
 2022-08-21 19:42:18 +00:00
Mysterijojo
b749b5a9cd corrected _vr icon diff 
Aaaaa.
 2022-08-21 12:13:12 -07:00
Mysterijojo
014ea7a0c4 ... forgot the tails. 
Forgot to split the tails.
 2022-08-21 12:04:51 -07:00
Mysterijojo
0c209034fe Separated new markings into /modular_chomp 
Hopefully reverted most the changes to /code, and ported them to /modular_chomp.
 2022-08-21 12:01:15 -07:00
Razgriz
8898dc5d39 Merge pull request #4740 from CHOMPStation2/Razgriz1032-patch-10 
Fix for bad topic response in bot channel
 2022-08-20 23:52:42 -07:00
Razgriz
ac27046ab4 Fix for bad topic response in bot channel 
I think maybe this will work? According to coderbus, "Depending on your fork, there was also a bad revision of /tg/ DM code that wrongfully intercepted TGS topics with a rate limiter. You can check this isn't happening by checking the macro TGS_TOPIC is the first thing called in your /world/Topic()"
 2022-08-20 17:52:31 -07:00
CHOMPStation2
ba74a74556 Fixes teshari Site Manager cloak being for nonexistant job of Facility Director 2022-08-20 12:03:03 +00:00
Novacat
e0865a6a33 Merge pull request #13537 from Heroman3003/tesh-cap-fix 
Fixes teshari Site Manager cloak being for nonexistant job of Facility Director
 2022-08-20 12:03:03 +00:00
Razgriz
749883ba55 Earlyporting policy fix 2022-08-18 14:25:21 -07:00
Razgriz
11dceba0c1 Policy on earlyporting. 2022-08-18 14:24:15 -07:00
Mysterijojo
e9ed37adb5 Sect drone bodytype marking 
Introduced sect drone bodytype markings, with appropriate wings and tail.
 2022-08-18 06:56:47 -07:00
Mysterijojo
f088770c05 Tyranid markings now under digitigrade 
Should've been done ealier. Leg shape after all.
 2022-08-18 03:41:26 -07:00
Mysterijojo
0873fe70ad Update markings_digi_ch.dmi 2022-08-18 03:29:46 -07:00
Mysterijojo
906c47537e tyranid body marking 
Tyranid bodytype marking split in separably colorable body, armor, and tail.
 2022-08-18 01:55:40 -07:00
Razgriz
efc83a4860 Re-add slavic language (#4729) 
* Re-add slavic language

Don'tn't.

* Slavic

* Slavic

* Slavic

* Slavic
 2022-08-17 22:50:13 -07:00
Mysterijojo
a94d81509a Update taurs_ch.dmi 
slight change in long virus (taur) tail front legs bit more spaced.
 2022-08-17 22:07:43 -07:00
Mysterijojo
02e19e6c2b Correctly moved virus markings 
Moved markings from markings.dmi, tails.dmi, and taurs.dmi to markings_ch.dmi, tails_ch.dmi, and taurs_ch.dmi

Moved altered code to modular_chomp folder
 2022-08-17 21:24:08 -07:00
Nadyr
1af47ca73d Merge pull request #4727 from CHOMPStation2/upstream-merge-13519 
[MIRROR] Small Staff Request addition
 2022-08-17 18:14:56 -04:00
Nadyr
54bacc908b Merge pull request #4724 from CHOMPStation2/upstream-merge-13523 
[MIRROR] Adds Altevian fashion
 2022-08-17 18:13:13 -04:00
Nadyr
537d1a6ebb Merge pull request #4725 from CHOMPStation2/upstream-merge-13521 
[MIRROR] Fixes pixel offsets breaking
 2022-08-17 18:02:47 -04:00
Nadyr
6a6e5cc70a Merge branch 'master' into upstream-merge-13519 2022-08-17 18:02:22 -04:00
Nadyr
7e8a879c90 Merge pull request #4726 from CHOMPStation2/upstream-merge-13526 
[MIRROR] Makes fire stacks be able to heat up body indefinetely
 2022-08-17 18:01:28 -04:00
Nadyr
c3a1713fef Merge pull request #4723 from CHOMPStation2/upstream-merge-13524 
[MIRROR] Makes the reverse-mouseray able to be made via research.
 2022-08-17 18:00:45 -04:00
Nadyr
fd1730f7ab Merge pull request #4720 from CHOMPStation2/upstream-merge-13492 
[MIRROR] Experimental implementation of automated role pings
 2022-08-17 18:00:19 -04:00
Nadyr
1dc7c0604e Merge branch 'master' into upstream-merge-13521 2022-08-17 17:49:38 -04:00
Nadyr
df01e7234c Merge pull request #4712 from CHOMPStation2/upstream-merge-13502 
[MIRROR] Fixes typo
 2022-08-17 17:47:46 -04:00
Nadyr
aa1c0f085d powder that makes you say yes 2022-08-17 17:47:04 -04:00
Nadyr
f0b51aba36 powder that makes you say yes 2022-08-17 17:45:16 -04:00
Nadyr
4c2388a68a powder that makes you say yes 2022-08-17 17:38:45 -04:00
Nadyr
e605606628 Merge pull request #4719 from CHOMPStation2/upstream-merge-13515 
[MIRROR] taurs are no longer fat shamed by human_movement.dm
 2022-08-17 17:37:02 -04:00
Nadyr
c7fc0804c8 Merge pull request #4699 from CHOMPStation2/upstream-merge-13485 
[MIRROR] Condenses all the animal languages and deletes unused/unwanted languages
 2022-08-17 17:35:28 -04:00
Nadyr
a29085e4b7 Merge pull request #4715 from CHOMPStation2/upstream-merge-13511 
[MIRROR] Fixes Altevian Pilot Voidsuit helmet
 2022-08-17 17:34:40 -04:00
Darlantan
5c1744e8f8 bundle that makes you say yes 2022-08-17 17:33:48 -04:00
Nadyr
8e96d3128b Merge pull request #4728 from Kazzc/GalleryFixess 
Gallery Fixes 1.0
 2022-08-17 17:32:50 -04:00
Nadyr
2579629cc6 powder that makes you say yes 2022-08-17 17:17:52 -04:00
Kassc
46ce99c91d Gallery Fixes 1.0 
-Fixed gallery maint access to null.
-slapped an ATM in the patient ward.
-Removed E-cig and added artist attire.
-Changed frosted glass to glass in the library.
 2022-08-17 17:05:16 -04:00
Nadyr
752c0aacd2 Merge pull request #4708 from CHOMPStation2/upstream-merge-13499 
[MIRROR] Ports Taur Loafing from Cit-RP & Chompstation13
 2022-08-17 16:56:22 -04:00
Nadyr
806b5326f5 powder that makes you say yes 2022-08-17 16:37:57 -04:00
Nadyr
cdbc4b5fb5 powder that makes you say yes 2022-08-17 16:37:25 -04:00
Nadyr
6f81050ea1 powder that makes you say yes 2022-08-17 16:37:02 -04:00
Casey
3053b70213 Small Staff Request addition 2022-08-17 20:28:12 +00:00
CHOMPStation2
c7cc1f46ae Makes fire stacks be able to heat up body indefinetely 2022-08-17 20:11:36 +00:00