Commit Graph

12603 Commits

Author SHA1 Message Date
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
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
Nadyr
d808f37f76 Merge pull request #2179 from CHOMPStationBot/upstream-merge-10619
[MIRROR] Fixes eggless spider versions still laying eggs if 'nest' was someone's body
2021-06-11 21:57:43 -04:00
Nadyr
cbe1fd8e41 powder that makes you say yes 2021-06-11 21:31:59 -04:00
Nadyr
58f85ec6a4 Merge pull request #2178 from CHOMPStationBot/upstream-merge-10617
[MIRROR] Adds PROPER tajaran ears as char setup option in ear category
2021-06-11 21:29:36 -04:00
Nadyr
dc134dd163 Merge pull request #2174 from CHOMPStationBot/upstream-merge-10620
[MIRROR] Adds a very lorg fen
2021-06-11 21:20:36 -04:00
Chompstation Bot
a4a954981a Adds Absorbed Examine settings to Vore Panel 2021-06-12 01:03:40 +00:00
Chompstation Bot
15a3190e36 Fixes eggless spider versions still laying eggs if 'nest' was someone's body 2021-06-12 01:02:26 +00:00
Aronai Sieyes
abc1d9f319 Merge pull request #10617 from Heroman3003/EARENING
Adds PROPER tajaran ears as char setup option in ear category
2021-06-12 01:02:19 +00:00
Aronai Sieyes
0beae20692 Merge pull request #10620 from VOREStation/Arokha/bigfen
Adds a very lorg fen
2021-06-12 00:59:51 +00:00
Chompstation Bot
9fb78f1b62 Ports suit dispenser from /vg/ 2021-06-11 19:14:48 +00:00
Nadyr
2d626c3b72 Merge pull request #2168 from CHOMPStationBot/upstream-merge-10604
[MIRROR] Adds a different version of bloodsucker trait
2021-06-10 02:55:46 -04:00
Nadyr
691114b7c8 powder that makes you say yes 2021-06-10 02:33:03 -04:00
Nadyr
e6eae4b90a powder that makes you say yes 2021-06-10 02:29:19 -04:00
Chompstation Bot
0f54f7f387 Adds a different version of bloodsucker trait 2021-06-10 02:27:16 +00:00
Chompstation Bot
f32683b3cb Add distress beacons to overmap ships/visitables 2021-06-10 02:18:55 +00:00
Nadyr
d43aef3cea Merge pull request #2129 from BlackMajor/bigdragon
New mob: Large Dragon, and some changes.
2021-06-09 18:35:02 -04:00
Nadyr
28f8653d04 Merge pull request #2161 from CHOMPStationBot/upstream-merge-10589
[MIRROR]  Makes voremobs with fullness-specific eye overlays utilize them.
2021-06-09 18:15:05 -04:00
radiantAurora
c53db5f190 Add files via upload 2021-06-09 19:21:12 +01:00
Novacat
000e68fa43 Merge pull request #10589 from Verkister/glowyguts
Makes voremobs with fullness-specific eye overlays utilize them.
2021-06-09 14:24:53 +00:00
Darlantan
003d049427 armadillo tweaks 2021-06-09 04:41:34 -04:00
Darlantan
852f8d16e8 remove OC mob inserts 2021-06-09 04:40:18 -04:00
BlackMajor
4c44a754e9 Update bigdragon_ch.dm 2021-06-09 18:02:27 +12:00
BlackMajor
3b1d7cc93f Some small adjustments, and fixing icon greyscaling 2021-06-09 17:41:49 +12:00
radiantAurora
fc07ffa69e Merge branch 'CHOMPStation2:master' into vore-belches 2021-06-09 00:06:17 +01:00
radiantAurora
3dd4c9ce37 Update life.dm 2021-06-08 23:51:36 +01:00
Nadyr
c78e9c16a5 Merge pull request #2131 from Verkister/patch-17
Enables vore for raccoons
2021-06-08 18:03:28 -04:00
BlackMajor
2ba9105571 Missed a span 2021-06-08 21:32:27 +12:00
BlackMajor
8d4d46dc47 Should be the last of the bugs 2021-06-08 21:26:12 +12:00
Nadyr
52bb59d560 Merge pull request #2136 from CHOMPStationBot/upstream-merge-10576
[MIRROR] spider emotes weren't added to the list yet
2021-06-07 18:26:31 -04:00
Nadyr
2f7f34a621 Merge pull request #2081 from Somememeguy/VoxColoring2
Vox Recoloring Edition: COLORFUL VOX, BAWK!
2021-06-07 18:16:07 -04:00
Novacat
38a1de24cd Merge pull request #10576 from quixoticstargazer/patch-1
spider emotes weren't added to the list yet
2021-06-06 16:44:31 +00:00
BlackMajor
bafc8e3683 lil' text update 2021-06-06 01:05:40 +12:00
BlackMajor
5b4a8004c9 various fixes and QoL 2021-06-05 23:46:50 +12:00
Verkister
01c00c7179 Enables vore for raccoons
The sprites for it exist so why not
2021-06-05 11:53:44 +03:00
BlackMajor
67823d8b59 Couple of easy tweaks before I go to bed 2021-06-05 02:39:03 +12:00
BlackMajor
15db3df23d small error fix 2021-06-04 15:52:45 +12:00
BlackMajor
58d669bdae Merge branch 'master' into bigdragon 2021-06-04 15:37:20 +12:00
BlackMajor
f6b222f6bc Should probably be able to escape the dragon's heal gut.. 2021-06-04 15:28:17 +12:00