Commit Graph

130 Commits

Author SHA1 Message Date
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role
Non crew role added
2022-10-29 19:08:16 -04:00
Nadyr
fc52bef699 Merge pull request #4796 from tacoguy7765093/VRfix-it-JUST-works
Adds a VR room and a functioning VR map for all your sandbox needs.
2022-10-24 17:13:51 -04:00
TheGreatKitsune
348a3ad6c5 Revert shield gen, modified shield caps 2022-10-24 04:30:29 -05:00
Razgriz
81da61dd70 Merge pull request #5134 from CHOMPStation2/BlackMajor-patch-2
Fixes some small transit bug.
2022-10-15 23:13:16 -07:00
BlackMajor
24c64ae0a6 Fixes 2022-10-16 11:33:57 +13:00
BlackMajor
df17de237a Whoops 2022-10-16 10:16:47 +13:00
Casey
f49362b8e1 Merge pull request #13851 from Heroman3003/emote-fixes
Fixes some one person having a specific emote giving it to everyone
2022-10-10 03:00:04 +00:00
Bib Bob
3365742b17 powder that makes you say yes 2022-10-08 22:41:28 -05:00
Nadyr
a4c87ef001 Merge pull request #5039 from tacoguy7765093/petasucks
Ports the animal clinic from tgstation as a superimposed pod
2022-10-08 23:31:20 -04:00
TheGreatKitsune
d6837d93e2 Add tribal clothing as defaults for non-crew 2022-10-08 18:31:44 -05:00
BlackMajor
f8162b416d Update mob.dm 2022-10-08 14:31:09 +13:00
BlackMajor
d37190a969 Update mob.dm 2022-10-08 14:27:58 +13:00
TheGreatKitsune
1d8bc1b862 Add vore sprite coloring. 2022-10-04 18:07:56 -05:00
Razgriz
6536f6e52b Merge pull request #5038 from KeRSedChaplain/clockcult-ports
Adds in a clockwork cult RIG suit
2022-10-02 19:03:19 -07:00
Razgriz
afd512c877 Merge pull request #5051 from cookiemans/foxtaur
Adds fox taur bodies
2022-10-02 19:02:12 -07:00
MeepleMuncher
12fe3383e0 add foxtaur code 2022-09-27 15:51:40 +03:00
Darlantan
a84d9c68e3 cleanup, icon_stuff, tutorial, sound, balance tweaks 2022-09-27 02:20:10 -04: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
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
Bib Bob
a112bd15b6 Merge remote-tracking branch 'origin/master' into petasucks 2022-09-24 16:57:18 -05:00
Bib Bob
dc91967a5a hospital poi is imposed pod 2022-09-24 11:28:38 -05:00
Dan-Neposh
62cafe298f Adds the suit 2022-09-24 08:10:26 -04:00
Bib Bob
4ac8de1f7e tags: disposal (of bodies)
dead VR bodies auto delete after 5 minutes, no more lag!
2022-09-23 10:50:49 -05:00
Razgriz
0b3333e12b Merge pull request #4970 from Verkister/cupcakebeast
Buffs muffin monster
2022-09-22 20:08:34 -07:00
TheGreatKitsune
5336bf7d08 adjust total positions to 3 2022-09-22 17:53:52 -05:00
TheGreatKitsune
f8204fb766 Add job description and adjust total positions 2022-09-22 00:57:47 -05:00
TheGreatKitsune
94be82f554 Adds superpose pod to non-crew loadout 2022-09-21 13:59:57 -05:00
TheGreatKitsune
2f4c829afa Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-09-21 13:42:13 -05:00
TheGreatKitsune
d6645adb36 Fix a few bugs with non-crew 2022-09-21 13:41:56 -05:00
Verkister
344486b795 new belly desc and even worse sprites >:3c 2022-09-21 18:42:26 +03:00
Verkister
822c3885fa Buffs muffin monster
Oh no.
Also adds sprites for the thing and a framework for simplemobs (via init_vore) or ingame varedits to set custom vorgan entry sounds.
2022-09-21 14:29:41 +03:00
Bib Bob
792f927e69 Adds more hat sprites for tesh
jank
2022-09-16 18:38:03 -05:00
Nadyr
a56f4f4f97 Merge pull request #4850 from UniquaSa/stru
More supply packs and small teppi tweak
2022-09-10 21:36:06 -04:00
Kassc
5a86b4ffbc Added names and descriptions.
As tittle says, every pod option now has names and descriptions.
2022-09-10 21:10:22 -04:00
TheGreatKitsune
9e4d474b93 Fix vore spawns as noncrew. 2022-09-10 12:29:02 -05:00
Darlantan
5e8b934cbf Super position survival pod for Kassc 2022-09-07 22:31:50 -04:00
SarmentiCampbell
30d4d95a3f removed crates 2022-09-06 18:41:15 +02:00
SarmentiCampbell
9bddec8134 crate
removed otie's crate
ay
2022-09-06 18:23:19 +02:00
TheGreatKitsune
4efab2d969 Merge master into non-crew-role and fix a map 2022-09-06 10:09:32 -05:00
Verkister
223c392f9e Update update_icons.dm 2022-09-02 16:41:57 +03:00
Verkister
f69597cd92 Fixes incorrect duplicate layer defines
And comments them out because they have no reason to be here in the first place as they already exist in the main file with their correct numbers and all.
2022-09-02 16:29:08 +03:00
BlackMajor
b7cf45e7d3 Merge pull request #4801 from AnymousUnknow/master
Digitigrade sprite fix
2022-08-29 17:07:17 +12:00
Mysterijojo
abd263e794 Digitigrade sprite fix
Done big copy-paste error. This should fix it.
2022-08-28 20:54:21 -07:00
Nadyr
5ce5931291 Merge pull request #4769 from VictorZisthus/viro-monkey-business
Monkey Recycler for Virology
2022-08-28 19:07:03 -04:00
Nadyr
408bf4de39 Merge pull request #4767 from Holdelta/BarUpdate
Refactoring existing CHOMPStation drinks into the modular folder, visual update to some drinks, and adding new drinks from other servers.
2022-08-28 19:06:15 -04:00
Nadyr
bc4bc525b2 Merge pull request #4734 from ItsSelis/tgui-bellyexport
HTML Export of Bellies
2022-08-28 18:21:53 -04:00