Commit Graph

66205 Commits

Author SHA1 Message Date
Novacat
ab680fd295 Upstream-11434 2021-08-24 21:11:09 -07:00
Cadyn
830bd23885 Make PR merge script executable 2021-08-24 20:53:58 -07:00
cadyn
b72675c68d Merge pull request #225 from CHOMPStation2/master
[pull] master from CHOMPStation2:master
2021-08-24 20:28:10 -07:00
Nadyr
b2c7a0f527 Merge pull request #2856 from CHOMPStationBot/upstream-merge-11441
[MIRROR] Fulpstation Labcoats
2021-08-24 23:22:01 -04:00
Nadyr
c65258a4c7 Merge pull request #2860 from CHOMPStationBot/upstream-merge-11439
[MIRROR] Ports RD labcoat from CitRP
2021-08-24 23:15:42 -04:00
Nadyr
f92da86f6b Merge pull request #2854 from CHOMPStationBot/upstream-merge-11443
[MIRROR] Fulpstation Misc Sprites
2021-08-24 23:14:55 -04:00
Nadyr
b0455c0b81 Merge pull request #2849 from CHOMPStationBot/upstream-merge-11456
[MIRROR] Fix rollover even harder
2021-08-24 23:14:14 -04:00
Nadyr
56e837508c Merge pull request #2847 from CHOMPStationBot/upstream-merge-11455
[MIRROR] Adds missing Idle Messages for all stomach modes in vore panel
2021-08-24 23:10:45 -04:00
Nadyr
13a5b2dc0a Merge pull request #2861 from CHOMPStationBot/upstream-merge-11438
[MIRROR] Adds *dwoop to all synths.
2021-08-24 23:10:35 -04:00
Nadyr
a9289de297 powder that makes you say yes 2021-08-24 23:10:03 -04:00
Aronai Sieyes
c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-24 23:06:09 -04:00
Nadyr
7c95d00648 powder that makes you say yes 2021-08-24 23:03:01 -04:00
Nadyr
6c91cb7292 Merge branch 'master' into upstream-merge-11456 2021-08-24 23:02:14 -04:00
Darlantan
acb2f0a992 bundle that makes you say yes 2021-08-24 22:59:14 -04:00
Nadyr
2a876c6885 Merge pull request #2862 from CHOMPStationBot/upstream-merge-11431
[MIRROR] Add rollover safety check
2021-08-24 22:58:01 -04:00
Nadyr
119b23b280 Merge pull request #2855 from CHOMPStationBot/upstream-merge-11442
[MIRROR] Fulpstation Briefcases
2021-08-24 22:57:13 -04:00
Nadyr
c595ddc4ca Merge pull request #2857 from CHOMPStationBot/upstream-merge-11446
[MIRROR] [MIRROR] Randomized Vendor Spawners for Mapping
2021-08-24 22:48:48 -04:00
Nadyr
ecd2231c64 Merge pull request #2851 from CHOMPStationBot/upstream-merge-11450
[MIRROR] Catslugs and Simplemob QoL
2021-08-24 22:35:50 -04:00
Nadyr
5393d3c474 Merge pull request #2840 from CHOMPStationBot/upstream-merge-11471
[MIRROR] helLO i forgot to change an icon name for crusher overlays please merge
2021-08-24 22:34:34 -04:00
Nadyr
e194abf37c Merge pull request #2852 from CHOMPStationBot/upstream-merge-11449
[MIRROR] [MIRROR] New Shotguns/Rifles
2021-08-24 22:33:48 -04:00
Nadyr
25af225f90 Merge pull request #2848 from CHOMPStationBot/upstream-merge-11458
[MIRROR] Fixes PAI deleting devoured things
2021-08-24 22:32:45 -04:00
Nadyr
601820e92e Merge pull request #2845 from CHOMPStationBot/upstream-merge-11461
[MIRROR] Can now give custom species names during vorebelly transformations
2021-08-24 22:27:07 -04:00
Nadyr
c8aa519dbc powder that makes you say yes 2021-08-24 22:25:49 -04:00
Nadyr
a9bae470da powder that makes you say yes 2021-08-24 22:21:34 -04:00
Nadyr
ca83d7c1e7 Merge branch 'master' into upstream-merge-11471 2021-08-24 22:20:31 -04:00
Nadyr
4fab058e37 Merge pull request #2841 from CHOMPStationBot/upstream-merge-11462
[MIRROR] Crusher Gaming
2021-08-24 22:19:31 -04:00
Nadyr
558e989683 powder that makes you say yes 2021-08-24 22:17:25 -04:00
Nadyr
0b11d15254 powder that makes you say yes 2021-08-24 22:14:34 -04:00
Nadyr
92a472d690 powder that makes you say yes 2021-08-24 22:13:51 -04:00
Nadyr
e3f92b0f8c powder that makes you say yes 2021-08-24 22:08:02 -04:00
Nadyr
cc0b139508 powder that makes you say yes 2021-08-24 22:05:08 -04:00
Nadyr
829455df51 powder that makes you say yes 2021-08-24 22:02:46 -04:00
Nadyr
a2ccaf59da Merge pull request #2839 from CHOMPStationBot/upstream-merge-11481
[MIRROR] [MIRROR] Fixes infinite naming loop
2021-08-24 21:54:11 -04:00
Nadyr
07c15da849 Merge pull request #2838 from CHOMPStationBot/upstream-merge-11480
[MIRROR] [MIRROR] Seed Contraband Changes
2021-08-24 21:50:44 -04:00
Nadyr
2c1b52b120 Merge pull request #2836 from CHOMPStationBot/upstream-merge-11479
[MIRROR] fixes the command dress jacket's role requirements
2021-08-24 21:50:12 -04:00
Nadyr
c9afb6b96d Merge branch 'master' into upstream-merge-11479 2021-08-24 21:27:28 -04:00
Nadyr
3c8badc6a2 Merge pull request #2837 from CHOMPStationBot/upstream-merge-11477
[MIRROR] [MIRROR] Updates wine reagent id to redwine.
2021-08-24 21:26:49 -04:00
Nadyr
bdf7cff223 Merge pull request #2842 from CHOMPStationBot/upstream-merge-11469
[MIRROR] Port some more clothes from CitRP + updates 'off' sprite for mesons & co to match new style.
2021-08-24 21:24:13 -04:00
Nadyr
cd36fdd2ab powder that makes you say yes 2021-08-24 20:55:15 -04:00
Nadyr
97dea72d18 powder that makes you say yes 2021-08-24 20:53:56 -04:00
Nadyr
e254f0dcc7 powder that makes you say yes 2021-08-24 20:52:25 -04:00
Nadyr
fc330574bb powder that makes you say yes 2021-08-24 20:51:45 -04:00
Nadyr
0d69fcb7db powder that makes you say yes 2021-08-24 20:44:37 -04:00
Nadyr
0f7bde4780 powder that makes you say yes 2021-08-24 20:41:37 -04:00
Nadyr
d3e639eb83 powder that makes you say yes 2021-08-24 20:37:05 -04:00
Nadyr
f326dceba1 powder that makes you say yes 2021-08-24 20:34:13 -04:00
Chompstation Bot
db123988c3 Add rollover safety check 2021-08-25 00:00:48 +00:00
Aronai Sieyes
64e0604641 Merge pull request #11431 from VOREStation/Arokha/rolloversafety
Add rollover safety check
2021-08-25 00:00:48 +00:00
Chompstation Bot
7c73952483 Adds *dwoop to all synths. 2021-08-25 00:00:42 +00:00
Aronai Sieyes
1de518597f Merge pull request #11438 from Torque4607/dwoop
Adds *dwoop to all synths.
2021-08-25 00:00:42 +00:00