cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 01:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,524 Commits 7 Branches 0 Tags
24e4ab6b51ca4f2ab21a5a7f04830625972045ed
Commit Graph

69524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Zisthus
24e4ab6b51 Fix 2022-05-15 21:07:06 -04:00
Victor Zisthus
705ff26285 Gripper buff 
Bottom text.

Allows borgs with said gripper to actually be able to help build Telesci equipment.
 2022-05-15 20:52:48 -04:00
Razgriz
1820631ada Merge pull request #4256 from CHOMPStation2/nanomaps_generation 
Automatic NanoMap Update
 2022-05-14 16:03:45 -07:00
Razgriz
80378415fd Merge pull request #4202 from LordSaladin/Cargo-crate-stuff 
Modular datums folder and supplypack folder with examples.
 2022-05-14 16:03:35 -07:00
NanoMap Generation
81b6b77edb NanoMap Auto-Update (Sat May 14 21:48:51 UTC 2022) 2022-05-14 21:48:51 +00:00
Razgriz
acb44b1327 Merge pull request #4200 from VictorZisthus/Explocarrierfix 
General Fix Mega PR
 2022-05-14 14:45:46 -07:00
Razgriz
5043c8fd9d Merge pull request #4250 from CHOMPStation2/upstream-merge-12962 
[MIRROR] Xenobio fixes
 2022-05-14 14:43:55 -07:00
Razgriz
d679202c6c Merge pull request #4249 from VictorZisthus/POI-Chapel-Update 
Chapel POI edit + Gravekeeper Drone Bugfix
 2022-05-14 14:43:41 -07:00
Razgriz
d7c6d66332 Merge branch 'master' into Cargo-crate-stuff 2022-05-14 14:41:35 -07:00
Razgriz
9507b6b6ec Merge pull request #4251 from CHOMPStation2/upstream-merge-12966 
[MIRROR] Fixes potential divide by zero in gibber
 2022-05-14 14:40:32 -07:00
Razgriz
58f645a908 Merge pull request #4252 from CHOMPStation2/upstream-merge-12963 
[MIRROR] Fixes hairnet having no icon
 2022-05-14 14:40:17 -07:00
Razgriz
fb1f5844fa Merge pull request #4253 from CHOMPStation2/upstream-merge-12968 
[MIRROR] Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 14:40:07 -07:00
CHOMPStation2
e68778a2a2 Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO… 2022-05-14 13:05:43 +00:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME 
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 13:05:43 +00:00
CHOMPStation2
76d0bcd0d7 Fixes hairnet having no icon 2022-05-13 23:52:46 +00:00
Novacat
f4a3f4f420 Merge pull request #12963 from Heroman3003/hairnet 
Fixes hairnet having no icon
 2022-05-13 23:52:46 +00:00
CHOMPStation2
01bdf6fcf9 Fixes potential divide by zero in gibber 2022-05-13 23:50:38 +00:00
Novacat
6d7fb6d42e Merge pull request #12966 from lm40/master 
Fixes potential divide by zero in gibber
 2022-05-13 23:50:38 +00:00
CHOMPStation2
3467562325 Xenobio fixes 2022-05-13 23:50:33 +00:00
Novacat
31b50e8e6e Merge pull request #12962 from Heroman3003/xenobio-fix 
Xenobio fixes
 2022-05-13 23:50:33 +00:00
Victor Zisthus
4aedcebbfb Four Tiles Fix 
Four pixels?

FOUR PIXELS?

I'm sorry...
 2022-05-12 21:33:51 -04:00
Victor Zisthus
1cc3d1937a Chapel POI edit + Gravekeeper Drone Bugfix 
Added some goodies to the chapel to make it a rest stop for explorers, and a viable base of operations for the gravekeeper drone. Increased it's generator recharge rates and gave it a SMES. If you manage to blow through all that power now...

Fixed the gravekeeper drone's emag item. Apparently, they only get one. Oops. Also gave it the ability to actually clean messes.
 2022-05-12 20:34:57 -04:00
Nadyr
525b514b60 Merge pull request #4248 from CHOMPStation2/upstream-merge-12958 
[MIRROR] Adds Nettie's fluff Tablet
 2022-05-12 19:58:45 -04:00
Nadyr
9cafbc8dd0 powder that makes you say yes 2022-05-12 19:40:22 -04:00
Nadyr
c06c702923 Merge pull request #4247 from CHOMPStation2/upstream-merge-12949 
[MIRROR] Winter coats for horse taurs + Warden alt coat revamp + taur HOS coat + taur nun coat
 2022-05-12 19:39:01 -04:00
Nadyr
7b6fff129f Merge pull request #4246 from CHOMPStation2/upstream-merge-12945 
[MIRROR] Sapient Bot Patches
 2022-05-12 19:38:26 -04:00
Nadyr
e8fc5bfbbb Merge pull request #4245 from CHOMPStation2/upstream-merge-12944 
[MIRROR] Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
 2022-05-12 19:37:49 -04:00
Nadyr
8e20c16b4f Merge pull request #4244 from CHOMPStation2/upstream-merge-12897 
[MIRROR] Cocoon Metamorphosis
 2022-05-12 19:36:21 -04:00
Casey
a3b274487f Adds Nettie's fluff Tablet 2022-05-12 19:42:57 +00:00
CHOMPStation2
79b3454139 Winter coats for horse taurs + Warden alt coat revamp + taur HOS coat + taur nun coat 2022-05-12 19:30:27 +00:00
Casey
7494748bc9 Merge pull request #12949 from FunnyCatEnjoyer/FunnyCatEnjoyer 
Winter coats for horse taurs + Warden alt coat revamp + taur HOS coat + taur nun coat
 2022-05-12 19:30:27 +00:00
CHOMPStation2
ebfd2cc5b4 Sapient Bot Patches 2022-05-12 19:29:20 +00:00
Casey
c4d92d6238 Merge pull request #12945 from FartMaster69420/bot-patch 
Sapient Bot Patches
 2022-05-12 19:29:20 +00:00
CHOMPStation2
b0f82ae305 Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects] 2022-05-12 19:26:08 +00:00
Casey
a5ed33a2e1 Merge pull request #12944 from Somememeguy/MakeCookingGreatAgain 
Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
 2022-05-12 19:26:08 +00:00
CHOMPStation2
2926e13470 Cocoon Metamorphosis 2022-05-12 19:21:54 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00:00
Razgriz
70d0e4cf4b Merge pull request #4229 from Raeschen/benos 
Creates a "better" xenomorph simple_mob type + other tweaks
 2022-05-11 10:04:57 -07:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934 
[MIRROR] Chest -> Torso Targeting Fixes
 2022-05-11 10:04:45 -07:00
Razgriz
9110ddf544 Merge pull request #4186 from harry3124/Yuliy-Gateway-Snowfield-4 
Additional gateway mission update
 2022-05-11 10:03:16 -07:00
LordSaladin
dfd09093f5 powder that enable the files 2022-05-11 11:29:36 +01:00
Razgriz
f514df7908 Merge pull request #4236 from CHOMPStation2/upstream-merge-12950 
[MIRROR] Fixes heart damage/nonexistence having no impact on functional blood levels
 2022-05-10 22:10:09 -07:00
Razgriz
cad28c1e69 Merge pull request #4235 from CHOMPStation2/upstream-merge-12937 
[MIRROR] Adds flat aeromorph wings
 2022-05-10 22:08:11 -07:00
Razgriz
2af377f021 Merge pull request #4234 from CHOMPStation2/upstream-merge-12936 
[MIRROR] Patching microwave recipes
 2022-05-10 22:07:52 -07:00
Razgriz
960b44dac9 Merge pull request #4233 from CHOMPStation2/upstream-merge-12943 
[MIRROR] Allow numbers in pAI name
 2022-05-10 22:07:39 -07:00
Razgriz
3ae219d312 Merge pull request #4232 from CHOMPStation2/upstream-merge-12942 
[MIRROR] TGUI Bundle Update Label
 2022-05-10 22:07:30 -07:00
Razgriz
4c58ad2471 Merge pull request #4231 from CHOMPStation2/upstream-merge-12948 
[MIRROR] Removes toddler onmob sprite
 2022-05-10 22:06:46 -07:00
Razgriz
2e5d144afa Merge branch 'master' into benos 2022-05-10 22:05:55 -07:00
Razgriz
3ef63724b5 Merge pull request #4228 from TheGreatKitsune/dragon-style-import 
Adds import and export style verbs to big dragons
 2022-05-10 22:05:12 -07:00
Razgriz
7e71e536fa Merge pull request #4223 from CHOMPStation2/upstream-merge-12930 
[MIRROR] Language color fixes
 2022-05-10 22:04:05 -07:00