Commit Graph

26083 Commits

Author SHA1 Message Date
Amy
8daaff8fe3 Test change 2020-11-29 14:34:40 -06:00
Amy
4af9b020fc It's wrist-mounted actually because that's cooler 2020-11-21 17:12:42 -06:00
Amy
77527ec516 Moves sizegun module to _vr.dmi 2020-11-21 01:22:46 -06:00
Amy
dae335f93a ACTUALLY finishes up clothes this time, I SWEAR *SOBBING* 2020-11-20 22:23:18 -06:00
Amy
1922255ad3 nikki necklace now only accepts mounted sizegun modules 2020-11-20 22:22:38 -06:00
Amy
142cddb523 Finishes rig size gun and makes it buildable by R&D 2020-11-17 17:00:13 -06:00
Amy
3bc54c4554 ACTUALLY finishes ALL of Nikki's clothes this time! 2020-11-17 16:18:16 -06:00
Amy
cf972fba13 adds the beginnings of a rigsuit-mounted size gun 2020-11-16 17:22:53 -06:00
Amy
4670d2da58 Adds the rest of Nikki's outfit, also everything renders properly ingame now yay! 2020-11-16 17:22:12 -06:00
Amy
1a49e5ba97 Makes the cape correctly render, 100% finishes the hat this time I swear. Now all the features of the hat work! 2020-11-15 00:11:43 -06:00
Amy
5d0d3bb38d Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff 2020-11-14 12:55:04 -06:00
Amy
1572eeee0e inhand checks are important, also necklace is smol 2020-11-14 12:54:25 -06:00
Unknown
f6fc13003b Balance fixes and bugfixes
- Adjusts some of the contents of the ERT ship.
- Fixes mercenary coms not working
- Hopefully! Fixes antag coms not working
- Fixes uplinks not deducting telecrystals when things are bought
2020-11-14 12:20:46 -05:00
Novacat
91bf76bc57 Merge pull request #9294 from ArgobargSoup/ArgoFluffWitchHat
Adds the entry for Felina's witch hat to fluff item loadout
2020-11-14 01:52:27 -05:00
Novacat
df1b78d14a Merge pull request #8848 from Cyantime/spaceweirdness
Remove gravity from debris field and rogue mining zones
2020-11-14 01:48:41 -05:00
Amy
fbc86cd535 it was because i forgot to add the ..(), I'm a dumbass 2020-11-12 20:22:14 -06:00
Amy
ae991c1fb2 Oh god it actually works yes but now it doesn't render in your icons WHY 2020-11-12 17:12:36 -06:00
Amy
1008e4cc95 HOLY FUCK THE HAT WORKS 2020-11-11 19:48:44 -06:00
Amy
6d5a0ee5a2 adds more of nikki's dorky outfit, rn just the necklace/cape 2020-11-11 02:46:04 -06:00
Amy
9f0d6a16ab adds start of nikki's dumb thing 2020-11-10 21:50:23 -06:00
ArgobargSoup
45d6a36fb0 Adds the entry for Felina's witch hat to fluff item loadout 2020-11-09 22:32:09 -08:00
Verkister
7c94823ae9 Merge pull request #9293 from VOREStation/Verkister-patch-6
Couple little borgo belly tweaks.
2020-11-08 19:28:28 +02:00
Verkister
d771a57663 Merge pull request #9288 from VOREStation/upstream-merge-7701
[MIRROR] Adds the Frostbelle
2020-11-08 19:04:32 +02:00
Verkister
0841aacdac Merge pull request #9287 from VOREStation/upstream-merge-7629
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 19:04:02 +02:00
Verkister
fcf4ba8492 Couple little borgo belly tweaks.
-Buffs supply satchel item count to 10.
-Adds a new damage multiplier var to adjust digestion damages for future features.

If I could figure out how to upgrade the ui window to tgui I'd also add in buttons to actually adjust those damages and multiplier.
2020-11-08 19:00:01 +02:00
Verkister
5eeb73814d Update organ.dm 2020-11-08 13:41:31 +02:00
Verkister
0fbd3b4bcb Update organ_icon.dm 2020-11-08 13:12:23 +02:00
Verkister
8d5c109be7 Update organ.dm 2020-11-08 13:10:06 +02:00
Verkister
5018df615e Update brain.dm 2020-11-08 13:08:35 +02:00
Verkister
249bc1418b Update simple_mob.dm 2020-11-08 13:07:23 +02:00
Verkister
62011781fc Update living.dm 2020-11-08 13:05:50 +02:00
Verkister
f93452e29c Update living_defines.dm 2020-11-08 13:05:11 +02:00
Verkister
86e2670970 Update human_defines.dm 2020-11-08 13:03:54 +02:00
Atermonera
9a596f0e45 Merge pull request #7751 from Greenjoe12345/clothesporting
Ports some clothing from uristcode
2020-11-07 15:32:07 -05:00
Atermonera
983790fa6d Merge pull request #7701 from Mechoid/Frostbelle
Adds the Frostbelle
2020-11-07 15:20:42 -05:00
Mechoid
019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
Verkister
00a117d318 Adds a new marking.
Toe beans for the stumpy vasilissan feet.
2020-11-07 14:00:08 +02:00
Verkister
f1d1862305 Merge pull request #9274 from Andromeda-K22/borg_hypo_buff
brings medihound hypo in-line with medihound sleeper
2020-11-02 10:49:19 +02:00
Andromeda-K22
c5e9e794d2 brings medihound hypo in-line with medihound sleeper 2020-11-01 19:32:38 -05:00
Detective-Google
6c4c3edc03 Update mob_defines.dm 2020-10-31 14:22:18 -05:00
Verkister
0639ec6ac6 Merge branch 'master' into spaceweirdness 2020-10-31 21:21:46 +02:00
Detective Google
2bcc77a0f2 Merge remote-tracking branch 'upstream/master' into pixel-shift 2020-10-31 14:19:05 -05:00
Detective Google
e28286a4ab edit tags 2020-10-31 14:13:30 -05:00
Detective Google
67513cb402 adds comfy little cabin pods 2020-10-30 14:54:12 -05:00
Detective Google
953cdfb800 ports pixelshifting 2020-10-30 13:43:20 -05:00
Verkister
1ba637b8bc Merge pull request #9248 from VOREStation/upstream-merge-7731
[MIRROR] Adds the ability to choose your default unarmed attack
2020-10-28 15:31:20 +02:00
Verkister
62e6109489 Merge pull request #9086 from ShadowLarkens/nif_streaming
Allow video calls with NIF commlinks
2020-10-28 15:08:25 +02:00
Cyantime
64ff25f5a3 Update survey_vendor.dm 2020-10-28 03:30:47 -04:00
Cyantime
9a3533c3f7 Update equipment_vendor.dm 2020-10-28 03:29:03 -04:00
Verkister
1051b2385c Merge pull request #9252 from VOREStation/upstream-merge-7738
[MIRROR] Stops slime securitrons from going ballistic when they get scratched
2020-10-27 10:17:51 +02:00