cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,527 Commits 7 Branches 0 Tags
d2927f408389696b4bf45f28b2b00f5d7916d924
Commit Graph

32345 Commits

Author SHA1 Message Date
Razgriz
d2927f4083 Update cell.dm 2022-05-18 14:00:56 -07:00
Razgriz
7e26f9d1a1 Restore power cell sprite to "V2" and add cells to protolathe 
-Restored power cell sprites to the "V2" sprites as I called them.
-Disabled base and virgo power cell/device/power_cell_research files and moved them into chomp modularity folder instead.

Added to the protolathe (I hope because I forgot to last time):
-Giga device cells
-Giga large cells
-Rechargeable weapon cell
-EMP-proof device cell
-EMP-proof weapon device cell
-Potato device cell


All the giga and recharging cells will require precursor tech 1.
 2022-05-18 00:28:31 -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
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
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
Novacat
f4a3f4f420 Merge pull request #12963 from Heroman3003/hairnet 
Fixes hairnet having no icon
 2022-05-13 23:52:46 +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
Novacat
31b50e8e6e Merge pull request #12962 from Heroman3003/xenobio-fix 
Xenobio fixes
 2022-05-13 23:50:33 +00: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
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
Casey
a3b274487f Adds Nettie's fluff Tablet 2022-05-12 19:42:57 +00:00
Casey
c4d92d6238 Merge pull request #12945 from FartMaster69420/bot-patch 
Sapient Bot Patches
 2022-05-12 19:29:20 +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
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
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
2e5d144afa Merge branch 'master' into benos 2022-05-10 22:05:55 -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
Razgriz
c7d8f6dcc5 powder that makes you say yes 2022-05-10 22:03:23 -07:00
Razgriz
822acd97e5 Merge pull request #4203 from VictorZisthus/general-fixes 
Making Gravekeeper Drone Viable
 2022-05-10 22:01:11 -07:00
Razgriz
f9bfb8139e Merge pull request #4201 from LordSaladin/autolathe-additions 
fixes the laws of thermodynamics for .45 LC i hope
 2022-05-10 21:58:20 -07:00
Novacat
e5082b645c Merge pull request #12950 from lm40/master 
Fixes heart damage/nonexistence having no impact on functional blood levels
 2022-05-10 20:50:00 +00:00
Novacat
73fc46d127 Merge pull request #12937 from Heroman3003/aeromorph-wings-flat 
Adds flat aeromorph wings
 2022-05-10 14:58:27 +00:00
Novacat
2bf16244eb Merge pull request #12936 from FartMaster69420/microwave-patch 
Patching microwave recipes
 2022-05-10 14:57:20 +00:00
Raeschen
bab9bcf1f8 Merge branch 'CHOMPStation2:master' into benos 2022-05-09 15:19:03 +02:00
Rae
3a61e8fac6 initial commit 2022-05-09 14:58:55 +02:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Novacat
689831a26f Merge pull request #12930 from Heroman3003/language-colors 
Language color fixes
 2022-05-08 21:33:26 +00:00
Nadyr
0ccf97a237 Merge pull request #4221 from CHOMPStation2/upstream-merge-12925 
[MIRROR] Adds chemistry kits
 2022-05-08 14:42:45 -04:00
Nadyr
2f1658e920 Merge pull request #4219 from CHOMPStation2/upstream-merge-12906 
[MIRROR] Making "Walkpods" a loadout option
 2022-05-08 11:17:28 -04:00
Nadyr
d074e33581 Merge pull request #4218 from CHOMPStation2/upstream-merge-12907 
[MIRROR] Integrated circuit camera can now use different networks, plus modular computer camera access change
 2022-05-08 11:16:17 -04:00
Nadyr
d86d2ccdf1 Merge pull request #4217 from CHOMPStation2/upstream-merge-12912 
[MIRROR] Adds Vertical Nom trait
 2022-05-08 11:15:43 -04:00
Nadyr
bc74b92698 Merge pull request #4216 from CHOMPStation2/upstream-merge-12902 
[MIRROR] Adds Echo Song language
 2022-05-08 11:14:49 -04:00
Nadyr
23ffa518e7 Merge pull request #4215 from CHOMPStation2/upstream-merge-12905 
[MIRROR] Alt. Naga Style Port
 2022-05-08 11:13:01 -04:00
Nadyr
3207a11ea6 Merge pull request #4214 from CHOMPStation2/upstream-merge-12901 
[MIRROR] Brightens Sol Common Language Color
 2022-05-08 11:12:10 -04:00
Nadyr
6c87352aa5 Merge pull request #4211 from CHOMPStation2/upstream-merge-12888 
[MIRROR] The pAI, Bot, and Microwave Tweaks
 2022-05-08 11:10:07 -04:00
Nadyr
18cc151c84 Merge pull request #4210 from CHOMPStation2/upstream-merge-12891 
[MIRROR] [MIRROR] Toner has a sprite again
 2022-05-08 11:09:07 -04:00
Nadyr
d4ef291152 Merge pull request #4209 from CHOMPStation2/upstream-merge-12881 
[MIRROR] Pocket pouch rebalance + obtaining method
 2022-05-08 11:08:37 -04:00
Nadyr
27af62e55a Merge pull request #4208 from CHOMPStation2/upstream-merge-12879 
[MIRROR] Adds belt slot flag to proto-kinetic machete and subtypes
 2022-05-08 11:07:31 -04:00
Nadyr
f0584a5ae2 Merge pull request #4207 from CHOMPStation2/upstream-merge-12877 
[MIRROR] Makes "Succumb" an IC verb, adds warnings
 2022-05-08 11:06:55 -04:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Casey
fc2a9fe7ef Merge pull request #12906 from ItsSelis/selis-guestpass-patch 
Making "Walkpods" a loadout option
 2022-05-08 09:54:54 +00:00