cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 7 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

18252 Commits

Author SHA1 Message Date
Atermonera
8c593664fe Merge pull request #7607 from Mechoid/FixHacktool 
Fixes the hacktool.
 2020-09-16 23:16:38 -04:00
Izac Joof Forsgren
d389a57133 Merge branch 'master' into kbraid.edit/additions 2020-09-16 13:38:00 +02:00
Novacat
a5e91553be Merge pull request #8998 from ShadowLarkens/tgui_metal 
TGUI Metal Menu
 2020-09-16 03:50:27 -04:00
Holdelta
a712a23562 I missed a few commas 2020-09-15 23:14:21 -07:00
Holdelta
f0b826a2d7 Reverting changes to RMS. 
Removing upstream changes.
 2020-09-15 23:04:53 -07:00
Braiden
565bb2a522 fixed a line 2020-09-15 19:35:29 -05:00
Braiden
6a0fb618c4 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-15 19:34:42 -05:00
Braiden
55d8523787 teshari alternate placement slots (plush only) 
was only able to figure out how to do it for the plushie. someone else will need to do the living tesh.
 2020-09-15 19:34:40 -05:00
SplinterGP
183a3f5282 comments 2020-09-15 20:43:41 -03:00
SplinterGP
2c62860a8e autolathe recycle materials 2020-09-15 20:23:01 -03:00
Izac Joof Forsgren
4e7b4df749 Merge branch 'master' into izac 2020-09-14 14:11:02 +02:00
Nadyr
b740b6e621 Merge pull request #540 from cadyn/Cyclercosmetics 
No changes option added to all cyclers, sprite check added.
 2020-09-13 21:45:02 -04:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
K'Braid
76807e6442 Merge branch 'master' into kbraid.edit/additions 2020-09-11 16:54:58 -05:00
Braiden
e463b40a20 fix 2020-09-11 16:53:17 -05:00
Braiden
8b0a2a285d tesh plushes can be held, they can be worn! 2020-09-11 14:56:56 -05:00
Verkister
93d94bbaa6 Fixes dual color wolftaurs losing butts on resleeve 2020-09-11 22:21:35 +03:00
Shadow Quill
eb19c52598 Welderbomb! 2020-09-11 14:03:47 -05:00
Novacat
3326555eab Merge pull request #9006 from cadyn/cyclerfixes 
No changes option added to all cyclers, sprite check added.
 2020-09-11 12:42:08 -04:00
Braiden
b8319062fb Better sprites, more sprites! 
Do not Merge first!
 2020-09-11 04:22:47 -05:00
Killian
ce327dd9de More Spawner Stuff (#7631) 
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks

* More Spawners
 2020-09-11 03:12:22 -04:00
Nadyr
03dc2710a8 Merge pull request #543 from cadyn/airlockfix 
Fixes airlocks
 2020-09-10 17:53:45 -04:00
Nadyr
74d85a194b Merge pull request #529 from ExabyteDiscord/dog-does-airlocks 
Clear Skies Ahead!
 2020-09-10 17:52:34 -04:00
Cadyn
5962b786db Upstream consistency 2020-09-10 13:30:33 -07:00
Cadyn
db990fc7e0 Airlock fix 2020-09-10 13:28:07 -07:00
Cadyn
cb1a04be7f Airlock fix 2020-09-10 13:24:29 -07:00
Erik
1318eaa49c Fixes some commenting 2020-09-10 02:09:06 -07:00
Braiden
ead7d70d97 a letter 2020-09-10 03:27:02 -05:00
Braiden
5e1b471925 A gift for Jeanne and an upgrade for Strix 2020-09-09 19:43:50 -05:00
Erik
b71dc4807f Adding CHOMPEdits 2020-09-09 06:52:04 -07:00
Killian
f2e0d9fbb5 mercenary cruiser 2020-09-09 13:03:03 +01:00
Cadyn
c35781b0ec Typo fix 2020-09-08 16:21:17 -07:00
Cadyn
f352366858 No changes option added to all cyclers, sprite check added. 
Added an option for no cosmetic changes to all suit cyclers, and added a check to make sure the sprite exists before fitting it. Also fixed typos in vulpkanin merc voidsuit helmet sprite name.
 2020-09-08 16:11:21 -07:00
Cadyn
76c426a030 No changes option added to all cyclers, sprite check added. 
Added an option for no cosmetic changes to all suit cyclers, and added a check to make sure the sprite exists before fitting it. Also fixed typos in vulpkanin merc voidsuit helmet sprite name.
 2020-09-08 15:48:22 -07:00
Killian
eb8ecaddb2 hull/glass replacement, further polish, other misc tweaks 
also adds plastitanium hull components for later use
 2020-09-08 06:34:44 +01:00
Novacat
767e9c62da Merge pull request #8990 from ShadowLarkens/tgui_ntos_rebased 
TGUI NTOS - Total Conversion
 2020-09-07 20:18:29 -04:00
Killian
bdaadc5726 general polish and prep 
includes some groundwork for the second phase of this PR
 2020-09-08 01:17:45 +01:00
Killian
5b4dc6069a all tests complete 2020-09-07 07:56:41 +01:00
Kates
21b8fedb3f Allow mechs to butcher things with their drill. (#7493) 
* Allow mechs to butcher things with their drill.
- Vague copy of a TG feature, made difficult by their different code. Still, it works.

* Add changelog
 2020-09-06 14:19:24 -04:00
Darlantan
e9abd9894d Comments out virgo staff posters 2020-09-06 03:18:26 -04:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Razgriz
0c713aa549 Merge pull request #530 from Darlantanis/ConfettiCannon 
Confetti cannon
 2020-09-05 10:58:08 -07:00
Novacat
ec19058d14 Merge pull request #8982 from VOREStation/upstream-merge-7615 
[MIRROR] Fix mech weapons breaking on self-deleting mobs
 2020-09-05 12:35:47 -04:00
Novacat
75186c414e Merge pull request #8987 from VOREStation/upstream-merge-7624 
[MIRROR] Fixes explosion maths.
 2020-09-05 12:25:19 -04:00
Novacat
af2e6a8b8b Merge pull request #8977 from VOREStation/upstream-merge-7619 
[MIRROR] Mech file typo. Mostly capitals.
 2020-09-05 12:23:59 -04:00
Novacat
5be90e22ff Update tanks.dm 2020-09-05 12:14:14 -04:00
Novacat
00f60b166d Merge pull request #8985 from VOREStation/upstream-merge-7618 
[MIRROR] Revert strafing speed nerf.
 2020-09-05 12:13:19 -04:00
Novacat
98cf24ad4c Merge pull request #8981 from VOREStation/upstream-merge-7614 
[MIRROR] Update Random Spawners
 2020-09-05 12:12:24 -04:00