cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,622 Commits 6 Branches 0 Tags
014db9fbe5453461954f4ff7c331c5641f282007
Commit Graph

12643 Commits

Author SHA1 Message Date
Razgriz
3c2b215c30 powder that makes you say yes 2021-07-02 21:18:21 -07:00
Razgriz
b8ce7ecf84 powder that makes you say yes 2021-07-02 21:15:20 -07:00
Chompstation Bot
bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +00:00
Verkister
cbeea3cd22 Properly unlocks shadekin ears 
An empty list here means nobody can use it
 2021-06-30 13:14:09 +03:00
Razgriz
fa9917de85 Merge pull request #2301 from kcin2001/xenohybrid-bump 
xeno hunter dome bump
 2021-06-28 03:58:16 -07:00
kcin2001
ea1897be79 changed to _ch files 
i dont want to go upstream really, i really should just put these under ears anyway
 2021-06-27 16:23:19 -07:00
Nadyr
0723d37983 Merge pull request #2299 from CHOMPStationBot/upstream-merge-10758 
[MIRROR] Fixes #10757
 2021-06-27 17:05:56 -04:00
Aronai Sieyes
974107d7eb Merge pull request #10758 from VOREStation/Fixes/10757 
Fixes #10757
 2021-06-27 16:13:27 +00:00
lm40
af32042b15 fixes #10700 (#10763) 
* Update human.dm

* Update robot.dm

* Update simple_hud.dm
 2021-06-27 16:10:18 +00:00
Razgriz
3111c1beee Merge pull request #2294 from kcin2001/shadekin-ears 
unlock shadekin ears
 2021-06-26 13:24:56 -07:00
Razgriz
52d29d42bb Merge pull request #1955 from CHOMPStationBot/upstream-merge-9969 
[MIRROR] Adds in Booze hounds.
 2021-06-26 13:23:49 -07:00
kcin2001
d5258e7851 unlock shadekin ears 
allow all species to use shadekin ears again, there too adorable to be hogged by 1 species (they're nice as just 4 fluffy ears)
 2021-06-26 01:50:46 -07:00
Razgriz
f5c36c9d60 why did you save that to a VR file bro 2021-06-25 01:28:29 -07:00
Razgriz
7773ef495f Merge pull request #2277 from CHOMPStationBot/upstream-merge-10270 
[MIRROR] Add phoron and nitrogen breather traits, and water breather trait
 2021-06-25 01:15:29 -07:00
Razgriz
ad1a518c54 Update station_vr.dm 2021-06-25 01:13:29 -07:00
Razgriz
08bad65230 Update dog_sleeper_vr.dm 2021-06-25 01:12:45 -07:00
Razgriz
e576626b35 Update dog_modules_vr.dm 2021-06-25 01:09:50 -07:00
Razgriz
679cfd0e5a Update dog_sleeper_vr.dm 2021-06-25 00:54:35 -07:00
Razgriz
a1c2000750 Merge pull request #2284 from CHOMPStationBot/upstream-merge-10746 
[MIRROR] Corrects rabbit typo
 2021-06-25 00:36:12 -07:00
Razgriz
534f505200 Merge pull request #2280 from Cyrelius/master 
Promethean Rebalance
 2021-06-25 00:33:38 -07:00
Razgriz
ae3ef479e8 powder that makes you say yes 2021-06-25 00:33:00 -07:00
Razgriz
618ca03c09 powder that makes you say yes 2021-06-24 17:40:51 -07:00
Novacat
0199e8befa Merge pull request #10746 from foopwo/learnyourcontractions 
Corrects rabbit typo
 2021-06-24 20:46:02 +00:00
Cyrelius
5f938603ba Merge branch 'CHOMPStation2:master' into master 2021-06-23 19:23:27 -07:00
Cyrelius
eec65f5534 Promethean damage multiplier rebalancing 
Brings burn multiplier down a more reasonable value and slightly lowers brute multiplier to be more in line with the 1:2 ratio that other servers have.  This will make lasers less likely to one-shot prometheans, but will still hurt severely.  A shot from a laser rifle should only do 96 damage at this multiplier, still enough to remove a limb, but less likely to send one to crit.
 2021-06-23 17:47:39 -07:00
Razgriz
6bd0f11441 Update mob.dm 2021-06-23 16:18:38 -07:00
Chompstation Bot
a424fbaf12 Add phoron and nitrogen breather traits, and water breather trait 2021-06-23 16:36:10 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
096246abff Merge pull request #2247 from cadyn/upstream-merge-10476 
Manual Mirror Vorestation #10476
 2021-06-20 17:14:14 -07:00
Razgriz
97b8fd26a7 Update death_vr.dm 2021-06-20 16:22:24 -07:00
radiantAurora
845c2981c4 oops 2021-06-20 23:51:50 +01:00
Nadyr
ccdb866bd3 Merge pull request #2149 from CHOMPStationBot/upstream-merge-10582 
[MIRROR] Phoron Dragon Catalogue Data
 2021-06-20 13:56:33 -04:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Nadyr
137ecfabc9 powder that makes you say yes 2021-06-19 22:22:52 -04:00
Nadyr
b82fa00b41 better lore 2021-06-19 22:20:02 -04:00
Razgriz
ae2e7a1365 Comment 2021-06-18 19:23:51 -07:00
Razgriz
540d32375d Merge pull request #2220 from CHOMPStationBot/upstream-merge-10662 
[MIRROR] Port current /tg/ lighting system
 2021-06-18 18:43:24 -07:00
radiantAurora
2c5bcd7b47 Merge pull request #1 from CHOMPStation2/master 
update to master
 2021-06-18 16:09:23 +01:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Razgriz
8aa043f4f4 Merge pull request #2210 from CHOMPStationBot/upstream-merge-10667 
[MIRROR] Fixes promethean hair remaining transparent when transparency is disasbled
 2021-06-17 15:28:51 -07:00
Razgriz
230d8e05ee Merge pull request #2214 from CHOMPStationBot/upstream-merge-10633 
[MIRROR] Fixes tons of empty lines showing up in borgs' examines
 2021-06-17 15:27:35 -07:00
Novacat
88e7b6fd66 Merge pull request #10633 from Heroman3003/many-borg-lines 
Fixes tons of empty lines showing up in borgs' examines
 2021-06-17 22:00:46 +00:00
Novacat
71902fbc47 Merge pull request #10667 from Heroman3003/hairfix 
Fixes promethean hair remaining transparent when transparency is disasbled
 2021-06-17 19:47:51 +00:00
Razgriz
09bbcb5565 Change lore 2021-06-17 02:10:11 -07:00
BlackMajor
9375ed7851 Tweaks leopardmander pref checks 
I misread this var and did it backwards lmao.
Leopardmanders are supposed to target regardless of digestion pref. Since, y'know, healbelly.

Webedit PR.
 2021-06-17 18:54:01 +12:00
Verkister
de7ad0a354 Couple raccoon fixes 
Fixes raccoons not having rest icon defined and also fixes them being super slow in player control.
 2021-06-14 12:11:24 +03:00
Razgriz
0c75b741ac Merge pull request #2156 from Darlantanis/armadillo_hat 
Armadillo hat
 2021-06-12 18:28:18 -05:00
Razgriz
5999bf8062 Merge branch 'master' into armadillo_hat 2021-06-12 18:08:13 -05:00
Novacat
0cd6f69bde Merge pull request #10624 from VOREStation/Arokha/willeatfix 
Fix will_eat returning true if !devourable
 2021-06-12 21:49:52 +00:00
Nadyr
e876bc2107 Merge pull request #2181 from CHOMPStationBot/upstream-merge-10603 
[MIRROR] Adds Absorbed Examine settings to Vore Panel
 2021-06-11 22:45:29 -04:00