cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,730 Commits 8 Branches 0 Tags
b204735fa23e6bb4e151c82009bb97d6b28a032d
Commit Graph

6284 Commits

Author SHA1 Message Date
Nadyr
985216ba9e powder that makes you say yes 2022-06-06 18:25:13 -04:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Nadyr
1d004e4bb8 Merge branch 'master' into upstream-merge-13038 2022-06-04 20:23:28 -04:00
Nadyr
ddc0c05b1f Merge pull request #4318 from CHOMPStation2/upstream-merge-13031 
[MIRROR] pAI and emote tweaks and upgrades
 2022-06-04 20:20:56 -04:00
Nadyr
4a04dddd7d Merge pull request #4303 from CHOMPStation2/upstream-merge-13014 
[MIRROR] Splits the scanners into separate files
 2022-06-04 20:20:27 -04:00
Nadyr
97af724389 powder that makes you say yes 2022-06-04 19:50:46 -04:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods 
localizes religion and adds custom chaplain titles
 2022-06-04 16:38:53 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Casey
e5cb4ab052 Splits the scanners into separate files 2022-05-29 17:45:06 +00:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys 
Adds a couple of new toys for cyborgs.
 2022-05-15 20:15:29 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00: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
Novacat
0eaa4a68ea Merge pull request #12943 from ItsSelis/selis-patch-pai 
Allow numbers in pAI name
 2022-05-10 14:53:07 +00:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +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
de3c078fad Merge pull request #4199 from CHOMPStation2/upstream-merge-12898 
[MIRROR] Communicator Ringtones
 2022-05-08 14:42:29 -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
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Novacat
5bffcf5062 Communicator Ringtones 2022-05-05 00:44:55 +00:00
Nadyr
19da7df9b5 Merge pull request #4192 from CHOMPStation2/upstream-merge-12861 
[MIRROR] Fixing Stack Deletion
 2022-05-01 18:17:18 -04:00
Nadyr
6373935f07 Merge pull request #4166 from CHOMPStation2/upstream-merge-12837 
[MIRROR] Stonks!
 2022-05-01 18:04:49 -04:00
Casey
5591cddadd Merge pull request #12861 from FartMaster69420/stack-patch 
Fixing Stack Deletion
 2022-05-01 03:10:03 +00:00
Razgriz
4ac931f832 Merge pull request #4157 from CHOMPStation2/upstream-merge-12568 
[MIRROR] Fixes the Xenochimera Details not being their own line
 2022-04-29 15:40:43 -07:00
Razgriz
c92ad71b51 powder that makes you say yes 2022-04-27 02:30:22 -07:00
Casey
d4c6ba9bb7 Stonks! 2022-04-26 21:23:17 +00:00
Casey
a9fd377e0c Fixes the Xenochimera Details not being their own line 2022-04-26 20:46:33 +00:00
BlackMajor
aeea4dfc9a Merge branch 'master' into protean-rework 2022-04-25 13:21:53 +12:00
Tasald
9962272e51 Exploration upgread (#4137) 
* Add pathfinder to drop pouches

adds pathfinder to drop pouches so they can have them to.

* Revert "Add pathfinder to drop pouches"

* Revert "Revert "Add pathfinder to drop pouches""

* Exploration gear update

Adds missing standard items to exploration lockers so they arn't gimped.

* Update misc.dm

* PF locker update

Adds the plate carrier and exploration bags to pathfinder locker

* PF bags

Lets the pathfinder spawn with exploration bags instead of generic ones

* Binocs

Adds binocs to the list of items that can be stored in the belt

* Ecig addition

Adds the standard and alternative ecigs to the base load out. dun know if setting the price of the alt one two 2 is good or not.

* removes sharp things

takes out the duplicate knife and machete

* removes macete holster

* Update outfit_vr.dm

* Update misc.dm

* Update belt_vr.dm

* Update misc_vr.dm

* Update misc_vr.dm

* Update loadout_accessories.dm

* Update loadout_smoking.dm

* Update misc.dm
 2022-04-21 23:45:03 -07:00
BlackMajor
678584eb2f ironing out icon conflicts 2022-04-21 01:40:12 +12:00
BlackMajor
4285553f90 Merge branch 'master' into protean-rework 2022-04-21 01:18:45 +12:00
BlackMajor
119b70776f Progress 2022-04-20 22:49:11 +12:00
Nadyr
43c08a70b8 Merge pull request #4014 from CHOMPStation2/upstream-merge-12658 
[MIRROR] Synthetic Life Lorebook
 2022-04-18 01:13:58 -04:00
Nadyr
4b093e0276 powder that makes you say yes 2022-04-18 00:58:19 -04:00
Nadyr
38c8fc442a Update manuals_vr.dm 2022-04-18 00:51:16 -04:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Nadyr
db0ddb1cd6 Merge pull request #4104 from CHOMPStation2/upstream-merge-12768 
[MIRROR] Pocky Fix
 2022-04-17 23:32:04 -04:00
Nadyr
6e009c29cc Merge pull request #4087 from CHOMPStation2/upstream-merge-12739 
[MIRROR] Late Night Stuff
 2022-04-17 21:08:17 -04:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
80cbe24947 Merge pull request #12768 from GhostActual/pocky_stick_fix 
Pocky Fix
 2022-04-17 21:17:00 +00:00
Casey
b9f0c0ef92 Late Night Stuff 2022-04-17 09:21:02 +00:00
Casey
05653f2feb Merge pull request #12727 from FartMaster69420/sheet-storage-fixes 
Stack Stacking: Restacked
 2022-04-17 09:15:33 +00:00
Razgriz
414b01d8bc Merge pull request #3996 from Raeschen/small 
Remove hand tele 5% chance to space
 2022-04-15 04:37:59 -07:00
Raeschen
81d0e5ea89 Revert "Change fail behavior 5% to a random teleport within 10 tiles" 
This reverts commit 84c55f0a4c.
 2022-04-15 11:07:46 +02:00
Nadyr
0b6719189b Merge pull request #4057 from CHOMPStation2/upstream-merge-12715 
[MIRROR] Allow capture crystals without owners to obtain owners
 2022-04-11 21:35:11 -04:00
Casey
68046eb0d4 Merge pull request #12715 from Very-Soft/capturecrystalfix 
Allow capture crystals without owners to obtain owners
 2022-04-11 19:27:53 +00:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Rykka
3b5c753b7b Start of TGMC Ammo HUD Port 
Ports Ammo HUD from TGMC, still WIP.
Progress Commit for tracking + allowing work on it later.
 2022-04-10 09:03:20 -06:00