Razgriz
dbc2cba71c
Merge pull request #5050 from Darlantanis/ChemistrySynthesizer
...
Programmable Automated Chemical Synthesizer
2022-09-29 18:58:57 -07:00
Kassc
7bba286e4a
Superpose fixes.
...
Various map fixes and balancing factors to make up for the new guidelines.
-Removed all loot piles.
-Removed all alien tier items.
-Reduced and downgraded all weapons.
-Reduced and downgraded all armors sets.
-Shrunk a few maps.
-Re-balanced a number of resources crates and gear crates on all POI's.
-Various decal and furnishing changes.
2022-09-29 06:26:58 -04:00
CHOMPStation2
fbddc79936
Enhances pakkuns
2022-09-28 23:49:56 +00:00
Casey
f25375fadf
Merge pull request #13818 from Screemonster/snapsnapsnappi
...
Enhances pakkuns
2022-09-28 23:49:56 +00:00
Nadyr
ad5729713a
Merge pull request #5047 from CHOMPStation2/upstream-merge-13809
...
[MIRROR] Adjusts abandoned crate content self-destruct
2022-09-27 18:50:06 -04:00
Razgriz
128a81f38d
Merge pull request #5049 from CHOMPStation2/I-like-pie
...
New Admin Smites
2022-09-27 11:14:31 -07:00
MeepleMuncher
12fe3383e0
add foxtaur code
2022-09-27 15:51:40 +03:00
MeepleMuncher
10625071f8
add foxtaur sprites
2022-09-27 15:49:07 +03:00
Razgriz
34d6ba6e9c
fix dme
2022-09-27 00:53:23 -07:00
Darlantan
a84d9c68e3
cleanup, icon_stuff, tutorial, sound, balance tweaks
2022-09-27 02:20:10 -04:00
Razgriz
352e734610
New smite
2022-09-26 19:55:46 -07:00
Razgriz
410d033754
Merge pull request #5048 from CHOMPStation2/Razgriz1032-patch-19
...
Allow gas tanks in armor back slot
2022-09-26 19:54:14 -07:00
Razgriz
e61f382360
Allow gas tanks in armor back slot
2022-09-26 18:59:58 -07:00
Razgriz
f63043c414
It works now
2022-09-26 18:47:05 -07:00
Razgriz
8b2a71586a
WIP New Smites
...
Pie and spice
2022-09-26 17:16:36 -07:00
CHOMPStation2
e9c32472c8
Adjusts abandoned crate content self-destruct
2022-09-25 22:42:29 +00:00
C.L
0853131f66
Merge pull request #13809 from Heroman3003/abandon-crate-fix
...
Adjusts abandoned crate content self-destruct
2022-09-25 22:42:28 +00:00
Darlantan
28ca297677
"100% functional" commit
2022-09-25 17:54:03 -04:00
Darlantan
542ff5e02f
how many times have I switched branches to fix mirrors
2022-09-25 17:54:03 -04:00
Darlantan
dfe4facb55
somethingsomethingswitchingbranches
2022-09-25 17:54:03 -04:00
Darlantan
97e061b39c
More branch switching
2022-09-25 17:54:03 -04:00
Darlantan
9199f5a281
switching branches AGAIN
2022-09-25 17:54:03 -04:00
Darlantan
65203bbfa0
switching branches again
2022-09-25 17:54:03 -04:00
Darlantan
97f330698a
Move new files to new(ish) modularity folder
2022-09-25 17:54:03 -04:00
Darlantan
3556c1bfb8
string procs that make Nadyr crazy
2022-09-25 17:54:03 -04:00
Darlantan
3dc0f284db
switching branches
2022-09-25 17:54:03 -04:00
Darlantan
f4fbb2cb90
WIP commit because I need to fix mirror conflicts right now
2022-09-25 17:54:03 -04:00
Darlantan
5897a5608e
Auto stash before checking out "Upstream/upstream-merge-12021"
2022-09-25 17:54:03 -04:00
Darlantan
06bd861d57
First "let's back up my work somewhere other than my HDD" commit
2022-09-25 17:54:03 -04:00
Nadyr
16cdb0dd2f
Merge pull request #5046 from CHOMPStation2/upstream-merge-13804
...
[MIRROR] ADMIN: EVENT
2022-09-25 17:50:54 -04:00
Nadyr
988c1c32b4
Merge pull request #5045 from CHOMPStation2/upstream-merge-13801
...
[MIRROR] Allows simplemobs to climb lattices
2022-09-25 17:50:33 -04:00
Nadyr
9b18f395f9
Merge pull request #5044 from CHOMPStation2/upstream-merge-13802
...
[MIRROR] Markings care package
2022-09-25 17:50:21 -04:00
Nadyr
8cc0ccef8b
Merge pull request #5042 from CHOMPStation2/upstream-merge-13799
...
[MIRROR] Mining adjustments
2022-09-25 17:50:06 -04:00
Nadyr
00addc1b24
powder that makes you say yes
2022-09-25 17:45:39 -04:00
Nadyr
f847203a61
powder that makes you say yes
2022-09-25 17:29:00 -04:00
Nadyr
dd731c7474
powder that makes you say yes
2022-09-25 17:25:07 -04:00
Nadyr
a527ae97e4
powder that makes you say yes
2022-09-25 17:21:44 -04:00
Nadyr
c3374cff9f
powder that makes you say yes
2022-09-25 17:19:38 -04:00
Nadyr
a0d7f749d6
Merge pull request #5041 from CHOMPStation2/upstream-merge-13800
...
[MIRROR] Removes old, janky-ass, unnecesary slowdown from numbing enzyme.
2022-09-25 17:16:18 -04:00
CHOMPStation2
c4c0a124cc
ADMIN: EVENT
2022-09-25 20:48:53 +00:00
C.L
dacb52516e
Merge pull request #13804 from Heroman3003/empty-message-fix
...
ADMIN: EVENT
2022-09-25 20:48:53 +00:00
CHOMPStation2
73f2b52514
Allows simplemobs to climb lattices
2022-09-25 20:48:49 +00:00
Casey
f9e6efa786
Merge pull request #13801 from Heroman3003/climbfix
...
Allows simplemobs to climb lattices
2022-09-25 20:48:48 +00:00
Casey
653720b0c6
Markings care package
2022-09-25 20:48:44 +00:00
Casey
1550c3bee5
Mining adjustments
2022-09-25 20:47:34 +00:00
CHOMPStation2
e374655fd4
Removes old, janky-ass, unnecesary slowdown from numbing enzyme.
2022-09-25 20:47:29 +00:00
Casey
1aed16efa6
Merge pull request #13800 from Heroman3003/enzymefix
...
Removes old, janky-ass, unnecesary slowdown from numbing enzyme.
2022-09-25 20:47:29 +00:00
Nadyr
535555b46c
Merge pull request #5040 from CHOMPStation2/upstream-merge-13290
...
[MIRROR] [MIRROR] Adds some core behavior code, uses it to fix a small bug (ABLE TO BE MERGED)
2022-09-25 16:45:46 -04:00
Nadyr
01e6b493af
Merge pull request #4984 from CHOMPStation2/upstream-merge-13762
...
[MIRROR] Fixes pakkun stuff
2022-09-25 16:40:42 -04:00
Razgriz
0d37872657
Merge pull request #5036 from CHOMPStation2/upstream-merge-13796
...
[MIRROR] Fixes D'Rudak'Ar not having oldchat font
2022-09-25 13:21:48 -07:00
