cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,354 Commits 9 Branches 26 Tags
0fbd3b4bcb42e7940559889e074dbb0faa5a7892
Commit Graph

26052 Commits

Author SHA1 Message Date
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
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
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
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
Verkister
201e0eab4b Merge pull request #9207 from VOREStation/upstream-merge-7680 
[MIRROR] Phoron bore utility improvements
 2020-10-27 10:15:30 +02:00
Verkister
44830393fc Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 10:15:15 +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
Novacat
b4fb235ba3 Merge pull request #9246 from ShadowLarkens/vchat_export_optimization 
13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation
 2020-10-19 23:18:53 -04:00
Meghan-Rossi
dc68ef2821 Fixes a runtime when alien syringes are spawned during map loading (#7734) 
Fixes a runtime when alien syringes are spawned during map loading
 2020-10-19 22:25:05 -04:00
ShadowLarkens
3f652d84f8 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation 2020-10-19 18:24:37 -07:00
Verkister
dbeaa0e183 Merge pull request #9241 from VOREStation/upstream-merge-7733 
[MIRROR] 5 new clothes & 1 headdress
 2020-10-18 16:20:47 +03:00
Verkister
da5752e857 Update equipment_vendor.dm 2020-10-18 16:10:47 +03: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
7eb390e4df Update survey_vendor.dm 2020-10-18 16:01:23 +03:00
Verkister
c9d1456615 Merge pull request #9237 from VOREStation/upstream-merge-7728 
[MIRROR] Fixes suit blood overlays on mobs not displaying.
 2020-10-18 15:57:26 +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
27ed429f48 Merge pull request #9232 from VOREStation/upstream-merge-7718 
[MIRROR] [FIX] Magboot & RIG Contamination/PHORONGUARD Usage
 2020-10-18 15:56:47 +03:00
Verkister
a865ac7484 Merge pull request #9213 from Meghan-Rossi/command_console 
Lets all heads set alert level, restores "Station Time" option to status displays
 2020-10-18 15:56:24 +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
d3f295b13f Merge pull request #9208 from VOREStation/upstream-merge-7696 
[MIRROR] Tweaked wall radiation calculation
 2020-10-18 15:55:05 +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
ba671e6cf3 Merge pull request #9087 from VictorZisthus/firefoamqol 
Added QOL Firefoam recipie
 2020-10-18 15:47:07 +03:00
Verkister
750868ed4e Merge pull request #9240 from VOREStation/upstream-merge-7732 
[MIRROR] Makes the recipe dump take catalysts into account
 2020-10-18 15:34:11 +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
2cf4d38b66 Merge pull request #9233 from VOREStation/upstream-merge-7723 
[MIRROR] Makes the recipe dump take coatings into account
 2020-10-18 15:31:08 +03:00
Verkister
0ed639054d Merge pull request #9228 from VOREStation/upstream-merge-7711 
[MIRROR] fix infinite ratburgers
 2020-10-18 15:28:58 +03:00
Verkister
9166452e35 Merge pull request #9226 from VOREStation/upstream-merge-7710 
[MIRROR] Fix solar trackers sometimes vanishing when deconstructed
 2020-10-18 15:28:26 +03:00
Verkister
e2bf1b009b Merge pull request #9224 from rboys2/clara-dev-more-drinks 
Drink addons and sprites
 2020-10-18 15:26:48 +03:00
Verkister
a595c41d95 Merge pull request #9223 from VOREStation/upstream-merge-7705 
[MIRROR] Fix blood from artifacts breaking the pathogenic isolator
 2020-10-18 15:26:19 +03:00
Verkister
af3f77e8ca Merge pull request #9221 from VOREStation/upstream-merge-7703 
[MIRROR] Make the tesla ball eventually run out of energy
 2020-10-18 15:25:42 +03:00