cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,825 Commits 8 Branches 26 Tags
ffb66290db6121c8a55ae8fa099ee8b8dcbc0e05
Commit Graph

34994 Commits

Author SHA1 Message Date
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Novacat
4eea2dad56 Merge pull request #5725 from VOREStation/upstream-merge-6423 
[MIRROR] Ports Bay's stomach pump.
 2019-08-28 01:54:26 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
4bb0599153 Merge pull request #6423 from chaoko99/stomach_pump 
Ports Bay's stomach pump.
 2019-08-28 01:25:37 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Novacat
98c1225e32 Merge pull request #5717 from VOREStation/upstream-merge-6419 
[MIRROR] Should solve the I.C. printer HREF exploit.
 2019-08-26 23:43:54 -04:00
Atermonera
7fc19250e6 Merge pull request #6419 from Mechoid/PrinterHREF 
Should solve the I.C. printer HREF exploit.
 2019-08-26 23:33:03 -04:00
Atermonera
ec9f1e0e3d Merge pull request #6420 from Mechoid/WhyAmILikeThis 
Fix SLED infinite looping.
 2019-08-26 23:32:52 -04:00
Glassbrain
b8a202baa9 Customise Say Verb Change 
Changes the "customise say verb" verb to "customise speech verb", solving a small problem of inconvenience that arises when typing "say" incompletely into the command bar, such as if you have a bad habit solidifed into muscle memory.
 2019-08-26 19:19:39 -03:00
Heroman
af94e7f374 Fixes some mimic bugs 2019-08-26 10:29:41 +10:00
Spades
a33aebe454 Merge pull request #5712 from Mewchild/MC-Hivebot 
Changes Ion Hivebots to not have EMP
 2019-08-25 05:55:07 -04:00
Mewchild
426c7f9e6c Changes Ion Hivebots to not have EMP 2019-08-25 03:13:56 -05:00
Novacat
6b8a80152f Merge pull request #5706 from Heroman3003/xenobio-sanity 
Adjusts xenobio closer to pre-refactor state
 2019-08-24 04:00:53 -04:00
Heroman
d71013d7f5 Adds exception for noscan species 2019-08-24 17:35:04 +10:00
Heroman
b0fa4e0dc7 Adjusts xenobio closer to pre-refactor state 2019-08-24 17:01:35 +10:00
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04:00
Heroman
8f880a9d82 Fixes secbots ignoring access for pull attacks 2019-08-24 05:43:41 +10:00
Novacat
1f6e7ff5ed Merge pull request #5700 from Heroman3003/merc-heat-fix 
Fixes mercenaries in spacesuits dying from Virgo 2 heat
 2019-08-23 03:01:56 -04:00
Heroman
6a21eccbd5 Fixes mercenaries in spacesuits dying from Virgo 2 heat 2019-08-23 16:23:08 +10:00
Novacat
c7c64f7551 Merge pull request #5696 from Heroman3003/shell-restrictions 
Restricts AI shells module- and z-level- wise
 2019-08-23 01:38:59 -04:00
Novacat
6032c38264 Merge pull request #5695 from Heroman3003/smitekin 
Returns shadekin smites
 2019-08-23 00:04:22 -04:00
Heroman
573555fef1 Undoes unintentional default config changes 2019-08-23 13:41:46 +10:00
Heroman
a20aa6be0b Fixes AI shells not getting the channels properly 2019-08-23 13:41:17 +10:00
Atermonera
3b3dce0e8c Merge pull request #6414 from InterroLouis/Typo-Fix 
Rigsuit Typo Fix
 2019-08-22 23:39:02 -04:00
Heroman
7c27f801f7 Restricts AI shells module- and z-level- wise 2019-08-23 12:25:21 +10:00
Heroman
f118fe8eda Returns shadekin smites 2019-08-23 10:46:42 +10:00
Novacat
15b48aa712 Merge pull request #5689 from Novacat/nova-basicfixes 
Redemption Machine Changes
 2019-08-21 22:42:50 -04:00
Novacat
2c4cd96be7 Merge pull request #5396 from KasparoVy/taur_hide_stuff 
Allows Tails to Hide Bodyparts, Shoes & Clip Uniforms/Suits
 2019-08-21 22:15:53 -04:00
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
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
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