Commit Graph

29586 Commits

Author SHA1 Message Date
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Nadyr
d69d166f2a Merge pull request #2036 from CHOMPStationBot/upstream-merge-10430
[MIRROR] Add secret zlevels
2021-05-26 01:05:08 -04:00
Nadyr
a9533bd9fb powder that makes you say yes 2021-05-26 00:55:26 -04:00
Chompstation Bot
04b2b0af70 Add secret zlevels 2021-05-26 01:44:00 +00:00
Novacat
47a73a6ef4 Merge pull request #10425 from Heroman3003/pipefix2
Fixes proteans being a bit too liberal with reformation
2021-05-25 22:54:57 +00:00
Nadyr
4b9bbca357 Merge pull request #2031 from CHOMPStationBot/upstream-merge-10408
[MIRROR] Maybe make deepspace levels slightly more robust?
2021-05-25 18:54:23 -04:00
Nadyr
000098dcf4 Merge pull request #2024 from CHOMPStationBot/upstream-merge-10414
[MIRROR] Fixes pizzaguy uniform
2021-05-25 18:25:11 -04:00
Nadyr
d161a9a3cb Merge pull request #2022 from Verkister/patch-12
Fixes ch taurs having lost their inherited tags
2021-05-25 18:23:46 -04:00
Nadyr
039bfd923f Merge pull request #2021 from Verkister/patch-11
Properly fixes mob feed/drop/slipnom inits
2021-05-25 18:23:24 -04:00
Chompstation Bot
5af77e4b11 Maybe make deepspace levels slightly more robust? 2021-05-25 21:32:11 +00:00
Novacat
00e139ff5d Merge pull request #10414 from Heroman3003/pizzafix
Fixes pizzaguy uniform
2021-05-25 18:14:15 +00:00
Verkister
115b803bdd Fixes ch taurs having lost their inherited tags
Fixes /ch/ subtype taurs not being able to wear the fitted stuff formerly inherited from their non-ch parent types.
2021-05-25 14:59:12 +03:00
Nadyr
3d5cf4f03f powder that makes you say yes 2021-05-24 19:33:52 -04:00
Verkister
f2ced3770d Properly fixes mob feed/drop/slipnom inits
Uh oh there was still one earlier check blocking out the previous fix attempt.
2021-05-25 02:29:02 +03:00
Novacat
ec82f7ed9c Merge pull request #10395 from TheFurryFeline/patch-32
Lore Fixy
2021-05-24 19:57:57 +00:00
Nadyr
ceadcb317d Merge pull request #2013 from CHOMPStationBot/upstream-merge-10399
[MIRROR] [MIRROR] phoron bore stock parts now affect range, along with other bits
2021-05-23 23:20:00 -04:00
Nadyr
7e9a634611 Merge pull request #2012 from CHOMPStationBot/upstream-merge-10397
[MIRROR] [MIRROR] Removes tin for ore generation
2021-05-23 23:07:46 -04:00
Nadyr
034f8d3383 powder that makes you say yes 2021-05-23 23:06:59 -04:00
Nadyr
ab64d36f4c Merge pull request #2001 from CHOMPStationBot/upstream-merge-10382
[MIRROR] Add mapping units/beacons for explo
2021-05-23 23:05:44 -04:00
Nadyr
3beacb065e Merge pull request #2011 from CHOMPStationBot/upstream-merge-10398
[MIRROR] [MIRROR] Wall-mounted Geiger Counters
2021-05-23 23:05:11 -04:00
Nadyr
9ef5ebc31f powder that makes you say yes 2021-05-23 23:02:08 -04:00
Nadyr
3bfd8dc484 Merge pull request #2003 from CHOMPStationBot/upstream-merge-10381
[MIRROR] Fixes soulcatcher nifsoft spawning with faulty toggle
2021-05-23 22:57:14 -04:00
Nadyr
09ecb2070b powder that make you say yes 2021-05-23 22:56:18 -04:00
Nadyr
d8f16f42a6 powder that makes you say yes 2021-05-23 22:48:17 -04:00
Nadyr
a95c9daf6f powder that makes you say yes 2021-05-23 22:39:08 -04:00
Chompstation Bot
1660fe9ff8 [MIRROR] phoron bore stock parts now affect range, along with other bits 2021-05-23 22:29:10 +00:00
Novacat
f4b442e67d Merge pull request #10397 from VOREStation/upstream-merge-8074
[MIRROR] Removes tin for ore generation
2021-05-23 22:28:02 +00:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +00:00
Novacat
eeb13a45f4 Merge pull request #10394 from izac112/master
adds missing instances of "result ="
2021-05-23 18:41:20 +00:00
Novacat
a65f821485 Merge pull request #10381 from Verkister/patch-53
Fixes soulcatcher nifsoft spawning with faulty toggle
2021-05-23 00:27:44 +00:00
Chompstation Bot
4d73aa5aca Add mapping units/beacons for explo 2021-05-22 21:48:00 +00:00
Nadyr
fdf91fb0b0 Merge pull request #1994 from CHOMPStationBot/upstream-merge-10375
[MIRROR] Split jukebox into two files, commit one
2021-05-22 17:09:41 -04:00
Nadyr
4e8101a0b1 Merge pull request #1998 from CHOMPStationBot/upstream-merge-10378
[MIRROR] Manual port Polaris Fixes
2021-05-22 17:07:25 -04:00
Nadyr
a4d772aa47 Merge pull request #1992 from CHOMPStationBot/upstream-merge-10362
[MIRROR] Add portable mapping devices
2021-05-22 16:57:18 -04:00
Nadyr
e574a45ea0 powder that makes you say yes 2021-05-22 16:56:38 -04:00
Nadyr
5bb9c65bfc powder that makes you say yes 2021-05-22 16:53:40 -04:00
Nadyr
66c9eb795b Merge pull request #1993 from CHOMPStationBot/upstream-merge-10366
[MIRROR] Changes Print vore belly settings to X-print vore belly settings.
2021-05-22 16:46:30 -04:00
Chompstation Bot
8911fe1de3 Manual port Polaris Fixes 2021-05-22 20:22:28 +00:00
Chompstation Bot
5b147760bd Split jukebox into two files, commit one 2021-05-22 19:32:15 +00:00
Novacat
4f59326f40 Merge pull request #10366 from lbnesquik/rereerretrtr
Changes Print vore belly settings to X-print vore belly settings.
2021-05-22 19:31:08 +00:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00
Novacat
5d69f8878d Merge pull request #10373 from ShadowLarkens/fix_vending
Initialize all vending products on server start & fix multiple food icons
2021-05-22 03:50:10 +00:00
Nadyr
67b36900c5 Merge pull request #1988 from CHOMPStationBot/upstream-merge-10342
[MIRROR] Adds some fennec treats
2021-05-21 19:00:34 -04:00
Nadyr
5f60a47e86 Merge pull request #1990 from CHOMPStationBot/upstream-merge-10368
[MIRROR] [MIRROR] Food 4 thought
2021-05-21 18:59:31 -04:00
Nadyr
c112b49c1c Merge pull request #1989 from CHOMPStationBot/upstream-merge-10369
[MIRROR] [MIRROR] [Bugfix] Maybe Fix Cleanbots
2021-05-21 18:51:32 -04:00
Nadyr
68fedbc716 Merge pull request #1984 from CHOMPStationBot/upstream-merge-10335
[MIRROR] Various qdel helpers
2021-05-21 18:27:25 -04:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083
[MIRROR] Food 4 thought
2021-05-21 20:00:24 +00:00
Novacat
416ba2411e Merge pull request #10369 from VOREStation/upstream-merge-8089
[MIRROR] [Bugfix] Maybe Fix Cleanbots
2021-05-21 04:54:02 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 19:05:42 +00:00