cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,530 Commits 8 Branches 26 Tags
bd2f4e99d3dbf71b11f76f8880540418280dbffb
Commit Graph

11185 Commits

Author SHA1 Message Date
Novacat
67fb08e6e2 Merge pull request #9335 from KasparoVy/damn-son-whered-i-find-this 
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
 2020-11-23 19:54:17 -05:00
VerySoft
7008be7083 Spellcheck the tummy text 
Thanks Xander <3
 2020-11-23 12:50:09 -05:00
Amy
568f4e42e0 Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability 2020-11-21 19:50:59 -06:00
KasparoVy
ae8970ab2f Eyes Synth Monitor, Switching Eye Layer Verb 
Everything works, trust me.
 2020-11-21 18:18:23 -05:00
KasparoVy
b062575363 Ports Cool Stuff from Bastion of Hestia/Vesta 
Fully implements DNA-integrated secondary & tertiary colouration for ears, wings and tails.

Adds some new ears, wings, tails and markings from Hestia.

Everything working in mint condition

EVERYTHING
 2020-11-21 14:57:44 -05:00
Novacat
57315d8913 Merge pull request #9330 from Very-Soft/eventystuff 
Eventy stuff and pet protections!
 2020-11-20 12:28:46 -05:00
VerySoft
575a57fa54 adds _vr for rel this time maybe 2020-11-20 12:05:15 -05:00
VerySoft
9923201e5b Adds _vr 2020-11-20 11:58:00 -05:00
KasparoVy
602c52cf3c SCREW IT THEY'RE ALL ICON_MULTIPLY 2020-11-19 02:21:58 -05:00
Unknown
7bc77c6740 Does this a bit more cleanly. 2020-11-18 19:48:24 -05:00
Unknown
7d609537da Removes Self-Surgery Toggle 
By staff request. It is largely agreed upon by staff that allowing players to enable self-surgery will just encourage more "i can avoid medbay" behavior which we are wanting to avoid.

It can still be enabled by var-edit but that is it.
 2020-11-18 19:46:21 -05:00
Novacat
4cbf8655f0 Merge pull request #9322 from VOREStation/upstream-merge-7671 
[MIRROR] Self-Surgery
 2020-11-18 17:29:58 -05:00
Novacat
8e53ab6fa9 Update living_defines.dm 2020-11-18 17:15:32 -05:00
Novacat
2812ba1163 Update living_defines.dm 2020-11-18 17:15:16 -05:00
Atermonera
02e7326aa0 Merge pull request #7759 from Mechoid/FixOrgansSimplemob 
Fix Simplemob+ Organs
 2020-11-18 16:58:47 -05:00
Mechoid
9cc7d641b2 Self-Surgery 2020-11-18 16:57:32 -05:00
Verkister
2bf5229f8e Fixes hotkey emotes not getting the proper textbox 
Now we can have both, textbox and typing indicator bubble.
 2020-11-17 14:05:35 +02:00
Verkister
d95709b464 Fixes pixel shifting breaking offsets 
Fixes pixel shifting breaking offsets for wide mobs by resetting into hard 0 rather than the mob's defined default offset.
 2020-11-15 20:49:54 +02:00
Verkister
02a3fe1a09 Merge pull request #9298 from Tenryumi/piper-hair 
Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 10:45:31 +02:00
KasparoVy
17d7a13bda Ports CitRP Protogen Markings/Robopart, Some Vox Markings, Teshari Markings Ears + Tails 
CitRP PR 2390 & 2168

Adds Protogen robohead (based on Ward-Takahashi Spirit) + Monitor states
Adds Protogen markings
Adds Teshari markings
Adds 2 Teshari Ears
Adds 4 Teshari Tails
Renames Basic Teshari Tail
 2020-11-14 20:51:01 -05: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
Amy
a46bd66c9d Adds new hair, moves hair code to a spot that makes more sense 2020-11-10 22:27:24 -06:00
Amy
bab3595ce5 adds Piper's crescent moon hair (still need add sprites) 2020-11-10 21:27:04 -06: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
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
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
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
Detective Google
e28286a4ab edit tags 2020-10-31 14:13:30 -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
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
Verkister
3f19f2c94f Merge pull request #9243 from Runa-Dacino/Hidewingstry2 
Adds the ability to hide, or reveal one's own wings with a verb
 2020-10-27 10:17:12 +02:00
greggbot
b21c4a2396 Stops slime securitrons from going ballistic when they get scratched (#7738) 
* Stops slime securitrons from going ballistic when they get scratched so they can actually discipline properly

* Stops slime ed-209 from retaliating
 2020-10-24 04:18:24 -04:00
ShadowLarkens
2e551428c4 Add Prof. Smokey's Lamia Mobs 2020-10-22 18:48:55 -07:00
Greenjoe12345
5f2232ba9b Adds the ability to choose your default unarmed attack (#7731) 
* Adds the ability to choose your default unarmed attack

* define things, names on the attack defines itself now

* changes the teshari default attack to claws, rather then bite.

* Fixed a duplicated thing?

* now hopefully fixed
 2020-10-20 21:21:33 -04:00
Verkister
823e1ae08b Merge pull request #9112 from Andromeda-K22/emote_text_box 
Removes single-line input on subtle and emotes, replaces with textbox
 2020-10-18 16:05:18 +03:00
Verkister
b0114374dd Merge pull request #9238 from VOREStation/upstream-merge-7729 
[MIRROR] Hearts on BOTH SLEEVES
 2020-10-18 15:56:56 +03:00
Verkister
4bf2976c6f Merge pull request #9209 from VOREStation/upstream-merge-7695 
[MIRROR] Changes 'Me' Verb to use a proper textbox instead of single-line input.
 2020-10-18 15:55:19 +03:00
Verkister
0835907cc8 Merge pull request #9175 from Runa-Dacino/Runa-Dacino-patch-1 
Enables research borgs with exosuit grippers to upgrade/repair borgs, take 2
 2020-10-18 15:52:23 +03:00
Verkister
dc6fe4ad34 Merge pull request #9234 from VOREStation/upstream-merge-7725 
[MIRROR] Fixes FBP heatsink not working for teshari
 2020-10-18 15:31:20 +03:00
Verkister
83a9b0b3ac Merge pull request #9219 from VOREStation/upstream-merge-7700 
[MIRROR] Animated pointing
 2020-10-18 15:25:03 +03:00
Verkister
ae8e37f2ca Merge pull request #9125 from Andromeda-K22/spacefam_speak 
Adds Spacer Language
 2020-10-18 15:24:40 +03:00
Verkister
3d4276984d Merge pull request #9173 from Meghan-Rossi/numbfangs 
Adds Numbing Fangs trait
 2020-10-18 15:22:49 +03:00