cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 6 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

35865 Commits

Author SHA1 Message Date
Unknown
a7bc6b858d Redemption Machine Changes 
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
 2019-08-21 20:17:39 -04:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358 
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
 2019-08-21 18:02:59 -04:00
Novacat
06fcadf97f Merge pull request #5688 from VOREStation/upstream-merge-6396 
[MIRROR] Chemistry Expansion
 2019-08-21 18:01:11 -04:00
Novacat
666d7836fc Merge pull request #5687 from VOREStation/upstream-merge-6410 
[MIRROR] Promethean Organ Tweakening
 2019-08-21 17:54:37 -04:00
Novacat
bf0e8f65de Merge pull request #5686 from VOREStation/upstream-merge-6397 
[MIRROR] Blind rage doesn't mean actually make them blind.
 2019-08-21 17:54:06 -04:00
Novacat
9b764d2753 Merge pull request #5685 from VOREStation/upstream-merge-6407 
[MIRROR] Adds Setting for Turrets to Shoot Downed People
 2019-08-21 17:53:55 -04:00
Novacat
17c2ba18be Update equipment_vendor.dm 2019-08-21 17:49:53 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Atermonera
65b6dc762c Merge pull request #6410 from Mechoid/PrometheanOrgans1 
Promethean Organ Tweakening
 2019-08-21 17:40:45 -04:00
Novacat
6bce101afc Update misc_special.dm 2019-08-21 17:32:42 -04:00
Atermonera
3d1f76e4f1 Merge pull request #6397 from Mechoid/BerserkUnblinding 
Blind rage doesn't mean actually make them blind.
 2019-08-21 17:30:09 -04:00
Atermonera
0bd3040886 Merge pull request #6407 from Nalarac/Turret 
Adds Setting for Turrets to Shoot Downed People
 2019-08-21 17:29:58 -04:00
Atermonera
caa612e264 Uniform Adjustments Phase 1 2019-08-21 17:26:28 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Unknown
b76b717221 Adds compact cataloguer for Field Medics 2019-08-21 17:10:00 -04:00
Verkister
f7a2580521 Bandaid for helper.dm runtime lag 
The latest news snippet being missing from communicator UI is a small price to pay for eliminating a severe runtime cascade for now.
 2019-08-21 18:44:20 +03:00
Heroman
2238bc2e16 Fixes not being able to pick up or drop items in bellies 2019-08-21 16:53:14 +10:00
Heroman
c0de032943 Fixes Merc Commando's corpse being named Syndie Commando 2019-08-21 04:54:03 +10:00
Unknown
affb606207 Changes sprite, improves code 2019-08-20 04:58:52 -04:00
Unknown
3aa2975f61 Removes WIP code 2019-08-20 04:30:59 -04:00
Unknown
e112a25026 Lynx made a booboo 2019-08-20 04:01:14 -04:00
Unknown
a4990aedf3 Keeps the dmi unchanged 2019-08-20 03:57:30 -04:00
Unknown
7682bacc63 Adds Pathfinder's Cataloguer 
Uses the tricorder sprites, the only special thing about it is that it can be closed up when stowed away. Cannot scan anything while it is closed up.
 2019-08-20 03:55:16 -04:00
KasparoVy
a9cfaa602a Adds Clip Masks Tailored to Alraune and Wasps 
Their body shapes were just too different from the default template especially around the pelvis so I made a couple clip masks for alraune and wasps.
 2019-08-20 02:13:58 -04:00
KasparoVy
a94c975cfe Account for Taur Suits in Uniform Icon Generation - Suit Checking 
Since we don't clip when wearing taursuits in suit icon generation we gotta maintain the same behaviour when we check suits in uniform icon generation.
 2019-08-20 01:56:09 -04:00
KasparoVy
d9b1e02405 Tails/Taurs Hide Shoes & Clip Uniforms/Suits 
Hides shoes when the goat legs or taur bodies are selected.
Adds a method by which you can clip off parts of sprites, ported from Para.

Sets goat legs & taur bodies to clip off the lower parts of uniforms and suits
so long as the clothing doesn't hide tails or is a taur suit.
 2019-08-20 01:56:08 -04:00
KasparoVy
e762c191ea Adds Ability for Tails to Hide Bodyparts 
Adds a method for tails to hide bodyparts like legs to allow for a bit more spriter freedom. Sets Satyr legs & taur bodies to prevent regular legs from rendering when selected.

E.g.1 The Satyr legs & taur bodies prevent the regular leg organs from rendering, so you no longer have to sprite them such that they cover the pixels ordinary legs would've occupied.

E.g.2 The deer body has bulky front legs because if they weren't sprited to cover the regular body beneath you'd have wierd pixels poking out. This prevents that from happening by preventing legs from rendering when you got a taur tail.
 2019-08-20 01:45:46 -04:00
Heroman
e8a9a537cd More emergency fixes 2019-08-20 11:49:09 +10:00
Novacat
3b6864c193 Merge pull request #5660 from Heroman3003/quickfix 
Emergency fixes
 2019-08-19 20:47:04 -04:00
CRTXBacon
1b368e978d Update custom_items_vr.dm 2019-08-20 00:11:26 +01:00
Heroman
78d3f43b10 Emergency fixes 2019-08-20 07:56:11 +10:00
Novacat
dfed56f83e Merge pull request #5615 from Michiyamenotehifunana/Toricrates-Remastered 
Resprites Crates (And stuff like the cargo tug)
 2019-08-19 17:07:23 -04:00
Novacat
a6cda4268a Merge pull request #5648 from sharpestlight/master 
wasp taurs
 2019-08-19 16:57:19 -04:00
Novacat
df9f9fff42 Merge pull request #5634 from Heroman3003/grenadefix 
Restricts station use of manhack grenades and seismic charges
 2019-08-19 16:57:04 -04:00
Novacat
66967f6d02 Merge pull request #5617 from Novacat/nova-shuttle 
New Expedition Shuttle
 2019-08-19 16:56:51 -04:00
Novacat
99d9653902 Merge branch 'master' into Toricrates-Remastered 2019-08-19 16:56:12 -04:00
Novacat
dea67ec3bb Merge pull request #5608 from Mewchild/MC-Quality 
Removes Awoo speech
 2019-08-19 16:55:19 -04:00
Novacat
d84f38b4db Merge pull request #5581 from TheFurryFeline/TFF-Faces_4_Seats 
Allows you to sit on someone's head
 2019-08-19 16:55:05 -04:00
Novacat
1baa0b99ab Merge pull request #5568 from Novacat/nova-heterochromia 
Adds a compact defibrillator crate
 2019-08-19 16:54:52 -04:00
Atermonera
9c3ef7da32 Merge pull request #6405 from Nalarac/patch-1 
Changes Hooligan Crab Meat to Crab Meat
 2019-08-19 01:03:57 -04:00
Novacat
1131e32aad Merge pull request #5652 from Heroman3003/fishing-nerf 
Nerfs damage of the fishing rods
 2019-08-18 20:55:27 -04:00
Heroman
8bf8a16340 Nerfs damage of the fishing rods 2019-08-19 10:30:58 +10:00
Novacat
eea9fc9373 Merge pull request #5651 from Heroman3003/fix-the-whoopsie 
Fixes roundstart runtime
 2019-08-18 20:23:33 -04:00
Heroman
6e8f35d80d Fixes roundstart runtime 2019-08-19 10:10:54 +10:00
Heroman
4dc79f669e Ports early fixes 2019-08-19 10:00:46 +10:00
sharplight
ae106e186c wasp taurs 
added wasp taurs to the game
 2019-08-18 13:54:07 -04:00
TheFurryFeline
23b3450404 Descriptive Role Restriction on Accessories 
Show what roles are allowed for webbing vests and drop pouches aside from the white variations.
 2019-08-18 12:34:48 -04:00
Novacat
fd2a11553f Merge pull request #5638 from Heroman3003/manifix 
Fixes borgs showing up in manifest in Misc category if they spawned roundstart
 2019-08-17 21:09:48 -04:00
Heroman
b2f3cc9bb5 Fixes borgs showing up in manifest in Misc category if they spawned roundstart 2019-08-18 09:37:17 +10:00
Novacat
1e2a76d042 Merge pull request #5637 from Heroman3003/button-highlights 
Adjusts modes of some buttons in character creation
 2019-08-17 18:25:17 -04:00