cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,825 Commits 9 Branches 26 Tags
bc7b3cb8621eaba9ee7b8f9cfb28735ffad06458
Commit Graph

18884 Commits

Author SHA1 Message Date
Verkister
bc7b3cb862 oops 2017-11-21 16:58:30 +02:00
Verkister
101fa7b2a0 Update dog_modules_vr.dm 2017-11-21 15:22:50 +02:00
Verkister
326de1809d makes lightweight nerds go down regardless 2017-11-21 15:16:11 +02:00
Verkister
b52c01fed3 Update dog_modules_vr.dm 2017-11-21 00:49:49 +02:00
Verkister
47e1cf3dd8 Update dog_modules_vr.dm 2017-11-21 00:44:51 +02:00
Verkister
4e47bb2dd0 Update dog_modules_vr.dm 2017-11-21 00:43:30 +02:00
Verkister
2fac878cb2 honk 2017-11-20 23:46:12 +02:00
Verkister
9111f18c88 serdy was right 2017-11-20 23:07:13 +02:00
Verkister
01ebd16f8b Finished borgopup port job and more! 
-Old original features brought back:
--Defib paws for medihound.
--Pounce for k9.
--Laser/taser wielding overlays.
--Pounce as emag addition for all dogborgs.
-Some code cleanups.
-Removed the old botched feeding attempt that was also overriding my 0 force polaris fix.
-Finally fixed my original blooper of accidentally making the sprite files 62p wide instead of 64.
-Also fixed the taller fluff file.
-Enabled the sparky wreck overlay we apparently had.
-Separated janipup eye lights to their own overlay.
 2017-11-20 13:52:20 +02:00
Cameron653
1de5a6c132 Update vorepanel_vr.dm 2017-11-19 11:25:34 -05:00
Cameron653
cf472937bf Merge pull request #2498 from Cameron653/DROPNOM_QUICK_FIX 
Fixes dropnom permastuns. Prevents dropnom double damage.
 2017-11-18 12:50:10 -05:00
Spades
13113791bd Merge pull request #2494 from VOREStation/Cameron653-patch-2 
Fluff Fixes
 2017-11-18 12:20:24 -05:00
killer653
9ead1295e1 Github didn't push this 2017-11-18 11:10:53 -05:00
Verkister
bb2deea01d Fixes my lossed updoots. 2017-11-18 17:39:00 +02:00
killer653
afa7b21dc9 Fixes permastuns. Prevents doubledamage 2017-11-18 10:37:58 -05:00
Cameron653
00ab8f752b Also fixes Ivy's fluff ID 2017-11-18 00:16:12 -05:00
Cameron653
5c4aac8ca7 Adds egg description 2017-11-17 21:01:46 -05:00
killer653
463b9c4dfb Edited files 2017-11-17 19:28:26 -05:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Neerti
264372ff1a Sanitizes Circuit Inputs 2017-11-17 18:38:48 -05:00
Spades
a412c18614 Merge pull request #2469 from Verkister/gimmicktraits 
Adds 2 gimmick traits and borgo feeding.
 2017-11-16 22:36:46 -05:00
Spades
bc51b77ed6 Merge pull request #2487 from Ketrai/patch-8 
Makes it solargrub larva produce solargrub meat.
 2017-11-16 22:36:22 -05:00
Spades
d80abeb939 Merge pull request #2475 from VOREStation/luger-nerf 
Rebalanced the Energy Luger
 2017-11-16 22:35:39 -05:00
Spades
0dbc5f92f9 Merge pull request #2490 from VOREStation/aro-deadgrab 
Stops runtime when ghosts examine people
 2017-11-16 22:35:01 -05:00
Arokha Sieyes
8e55f94e97 Merge pull request #2484 from Verkister/gogliberation 
Unrestricts my fluff goggles for general loadout use.
 2017-11-16 15:31:48 -05:00
Arokha Sieyes
bd5e5cf08b Merge pull request #2483 from VOREStation/Auream-Imperium-fix 
Update organizations_vr.dm
 2017-11-16 15:30:33 -05:00
Arokha Sieyes
52e6096be6 Stops runtime when ghosts examine people 
Defines this proc so that it will work on every mob, then overrides it on living to work like normal. I'd use INFINITE but I have no idea what would happen if it tried to do math on it.
 2017-11-16 15:24:18 -05:00
Ketrai
52d004c0fd Makes it solargrub larva produce solargrub meat. 
They just drop red meat right now, silly.
 2017-11-16 20:35:01 +01:00
elgeonmb
a7f8a8270e changes max shield radius 
as requested by Mazian on the forums.
 2017-11-16 02:17:06 -08:00
Anewbe
1d9adcb285 Merge pull request #4267 from Neerti/11/14/2017_icon_scaling 
Makes Icon Scaling Great
 2017-11-16 01:52:05 -06:00
Verkister
7c7794f74f Unrestricts my fluff goggles for general loadout use. 
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
 2017-11-16 09:31:27 +02:00
Spades
64da022bd6 Merge pull request #2473 from Cameron653/SILVERTALISMAN_CUSTOM_IMPLANT 
Silvertalisman custom implant
 2017-11-15 19:46:10 -05:00
Spades
c501e16e05 Update organizations_vr.dm 
Auream Imperium not Imperium Auream.
 2017-11-15 19:45:25 -05:00
Anewbe
ff9a191135 Merge pull request #4265 from Atermonera/conscious_strip 
MouseDrop checks incapacitated() before giving inventory access
 2017-11-15 12:36:16 -06:00
Spades
55837653b2 Merge pull request #2470 from Verkister/wrecc 
Dogborg wreck and rest icons now work properly!
 2017-11-15 11:01:21 -05:00
Verkister
56257b302a Merge branch 'gimmicktraits' of https://github.com/Verkister/VOREStation into gimmicktraits 2017-11-15 17:52:47 +02:00
Verkister
a5ff9415fa Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm
 2017-11-15 17:52:15 +02:00
Spades
904899fcde Merge pull request #2477 from Verkister/plowthatnerd 
Adds an inconveniently evil new negative trait.
 2017-11-15 10:48:55 -05:00
Verkister
fb7ebab196 Update living.dm 2017-11-15 16:39:33 +02:00
Verkister
b4c707e591 Update living.dm 2017-11-15 07:56:01 +02:00
Neerti
0315b18185 Makes Icon Scaling Great 
Scaling wasn't great before so no Again.
Makes most icons not get blurry when scaled.
Makes all /atom/movable s able to be scaled with the adjust_scale() proc.
Adds ability for species to get scaled automatically.  Currently no species does this, but it is an option in the future.
Adds four traits to adjust your mob scale.  It is purely cosmetic at this time.
 2017-11-14 19:32:49 -05:00
Verkister
f02f3b2846 Adds an inconveniently evil new negative trait. 
-"Lightweight", cost -4, every non-helpful bump received has a 50% chance to knock you down.
 2017-11-14 20:48:40 +02:00
Verkister
23906d8749 Un-duplicates head marking cache generation. (#4257) 
* Un-duplicates head marking cache generation.
-Organ icon generation for heads no longer adds the markings list into the cache key twice.
-Related to similar dismemberment crashes as the earlier organ cache issue fixes.

* Update organ_icon.dm
 2017-11-14 12:24:00 -06:00
Verkister
c7a3c92b1c Stops 0 force item paps turning borgs into pyrotechnical sparklers. (#4261) 
* Stops 0 force item paps turning borgs into pyrotechnical sparklers.
-That's just too much of a silly thing to happen without damage.

* Adds verb for party sparks.

* Update robot.dm
 2017-11-14 10:39:29 -06:00
Anewbe
3c151021c8 Merge pull request #4262 from Atermonera/AI_verbs 
AI verbs are no longer hidden
 2017-11-14 10:38:48 -06:00
Verkister
8c1fb156be Adds a cosmetic "armor vest" taur saddlebag subtype. 
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
 2017-11-14 16:18:47 +02:00
Atermonera
ee8f3ffbce MouseDrop checks incapacitated() before giving inventory access 2017-11-13 23:46:11 -08:00
Verkister
540901e359 Update neutral.dm 2017-11-14 09:23:08 +02:00
Spades
121f626d10 Tweaked the description 
Makes it more unique.
 2017-11-14 02:21:46 -05:00
Verkister
03121273a6 Update positive.dm 2017-11-14 09:21:32 +02:00