cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 23:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,635 Commits 6 Branches 0 Tags
d75c98d9b6eaec7956e403cf41e2c0035c3af4bc
Commit Graph

3924 Commits

Author SHA1 Message Date
Victor Zisthus
d209cf735c Brass tools icon fix 
Title.

FIXES #4174
 2022-08-04 22:50:12 -04:00
xnqm8h
a5fef3cfbf Update pouches.dm 2022-08-03 20:04:56 -04:00
Nadyr
5d2105ea36 Merge pull request #4637 from CHOMPStation2/upstream-merge-13423 
[MIRROR] get_random_colour() now prepends a #
 2022-08-01 22:32:12 -04:00
Nadyr
ac1f228231 powder that makes you say yes 2022-08-01 22:11:09 -04:00
Poojawa
575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
Casey
ac204e7749 Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs 2022-07-29 20:48:29 +00:00
Nadyr
c5a0f8fb24 Merge pull request #4584 from CHOMPStation2/upstream-merge-13371 
[MIRROR] Fixes in-chat icons being broken in oldchat
 2022-07-20 21:12:22 -04:00
Nadyr
9d5dc5e62f Merge pull request #4566 from CHOMPStation2/upstream-merge-13346 
[MIRROR] Adds double engi closets for SD and RP
 2022-07-20 20:35:49 -04:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Nadyr
a507a21424 powder that makes you say yes 2022-07-19 20:50:10 -04:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +00:00
Casey
2ad683220b Adds light and heavy frame traits 2022-07-15 22:30:56 +00:00
Kassc
9d620f4096 Merge pull request #4329 from VictorZisthus/majormapedits 
Massive Broad Scope Changes
 2022-07-13 19:02:32 -04:00
Nadyr
44525f2e7c Merge branch 'master' into upstream-merge-13313 2022-07-11 21:45:29 -04:00
Nadyr
7af3a7f746 Merge pull request #4524 from CHOMPStation2/upstream-merge-13295 
[MIRROR] New book: Guide to Robotics
 2022-07-11 20:44:14 -04:00
Casey
2c4d18a678 Guide to Robotics wiki-link fix 2022-07-10 22:52:12 +00:00
Casey
f67861210f New book: Guide to Robotics 2022-07-08 00:32:30 +00:00
Casey
27b89fc164 Merge pull request #13278 from Heroman3003/implanter-fix 
Fixes implanter implant teleportation
 2022-07-08 00:30:06 +00:00
Casey
3620af967b Merge pull request #13243 from Heroman3003/seismic-admin 
Makes seismic charges not work on admin z-levels
 2022-07-03 09:05:50 +00:00
Casey
8dd5039119 Fixes issues with taurs and belts/suits. Again. 2022-06-25 02:23:35 +00:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Victor Zisthus
aca04e1d65 Runtime Fix attempt 2 2022-06-06 14:02:45 -04:00
Victor Zisthus
45aaffb4fb Runtime fix 
Probably. Unit tests will tell.
 2022-06-06 13:23:29 -04: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
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Nadyr
6373935f07 Merge pull request #4166 from CHOMPStation2/upstream-merge-12837 
[MIRROR] Stonks!
 2022-05-01 18:04:49 -04:00
Casey
d4c6ba9bb7 Stonks! 2022-04-26 21:23:17 +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
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
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
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00