cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,239 Commits 9 Branches 26 Tags
7bffcf4ea2d2da2df59b39c25a5cfe7158ce7df1
Commit Graph

26006 Commits

Author SHA1 Message Date
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
Verkister
d0273c1585 Merge pull request #9220 from VOREStation/upstream-merge-7702 
[MIRROR] Tesla ball and containment field shock fixes
 2020-10-18 15:25:26 +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
Verkister
be57d49425 Merge pull request #9181 from Runa-Dacino/NIF-MassAlteration-Option-No 
Makes it possible to cancel out of Mass Alteration
 2020-10-18 15:22:17 +03:00
Verkister
35bf32a338 Merge pull request #9195 from Rykka-Stormheart/shep-dev-background-stuff 
Adds Virgo-Erigone, Virgo 3b and Virgo 4 as home/citizenship options
 2020-10-18 15:20:26 +03:00
Verkister
018924dfe9 Merge pull request #9203 from VOREStation/Verkister-patch-1 
Fixes prone turning for tall species
 2020-10-18 15:19:52 +03:00
Verkister
1b59c4082e Merge pull request #9211 from VOREStation/Verkister-patch-3 
Fixes dogborg cell lick recharge.
 2020-10-18 15:13:32 +03:00
Verkister
26b2eeb504 Merge pull request #9148 from KillianKirilenko/kk-misc2 
'Closed eyes' markings
 2020-10-18 15:12:41 +03:00
Meghan-Rossi
4c9a63bec1 Makes the recipe dump take catalysts into account (#7732) 
Makes the recipe dump provide information on catalysts needed for food and drink recipes.
 2020-10-17 06:14:40 -04:00
KasparoVv
e2d4e74157 I Wear my Heart on My Sleeve(s) (#7729) 
Both of them.
 2020-10-17 06:10:04 -04:00
FenodyreeAv
59dff12f99 Fixes suit blood overlays on mobs not displaying. (#7728) 
* Fixes suit blood overlays on mobs not displaying.

* Assigns the correct blood overlays to security armour.
 2020-10-17 06:08:48 -04:00
Verkister
817f930ff9 Fixes FBP heatsink not working for teshari (#7725) 
* Fixes FBP heatsink not working for teshari

The heatsink organ was using a species var that hadn't been defined for teshari so their thermostat was just using human values.

* Also fixes tajara temperature levels.

what a mess
 2020-10-17 06:04:58 -04:00
Meghan-Rossi
78fa0c490a Makes the recipe dump take coatings into account (#7723) 
Makes the recipe dump provide information on coatings needed for food recipes.
 2020-10-17 02:11:25 -04:00
Killian
6a9db51739 [FIX] Magboot & RIG Contamination/PHORONGUARD Usage (#7718) 
* Update robotics.dm

* Update scanner.dm

* Update snacks.dm

* rig contamination prevention
 2020-10-17 02:10:09 -04:00
Meghan-Rossi
91b19a9407 fix infinite ratburgers (#7711) 
fixes https://github.com/PolarisSS13/Polaris/issues/7709 (mice used in mouse burgers not being used up)
 2020-10-17 02:06:07 -04:00
Meghan-Rossi
547cedfc22 Fix solar trackers sometimes vanishing when deconstructed (#7710) 
Fix solar trackers sometimes vanishing, without leaving an assembly behind, when deconstructed.  Also refactor solar code a little.
 2020-10-17 02:04:40 -04:00
Riley
14e1243a87 Drink addons and sprites 2020-10-16 05:40:14 -04:00
Meghan-Rossi
4309e7e112 Fix blood from artifacts breaking the pathogenic isolator (#7705) 
Prevents blood not drawn from a humanmob (such as blood from artifact replenishing bowls or blood spawned in in reagent cartridges) from breaking the pathogenic isolator's interface.
 2020-10-15 05:44:33 -04:00
Meghan-Rossi
066a36487b Make the tesla ball eventually run out of energy (#7703) 
Currently the tesla ball only loses energy until it runs out of orbiting mini-balls, then sticks around forever.  This makes it keep losing energy until it dissipates.
 2020-10-15 05:42:02 -04:00
Cyantime
d057218154 no escape from electric fate (#7702) 2020-10-15 05:40:44 -04:00
ShadowLarkens
44c0c5b170 Animated pointing (#7700) 2020-10-15 05:34:17 -04:00
Meghan-Rossi
56000c8d4c Renames "Shuttle ETA" to "Tram ETA" 
Renames the "Shuttle ETA" option for status displays to "Tram ETA", because we have a tram and not a shuttle.
 2020-10-13 00:50:02 +01:00
Meghan-Rossi
9556471749 Restores "Station Time" option for status displays 
Adds the "Station Time" option for status displays from the pre-TGUI communications console to the TGUI communications console.  Tested, consistent with Polaris and pre-TGUI behavior.
 2020-10-13 00:49:47 +01:00
Meghan-Rossi
f845632151 Let all heads change alert levels 
Moves alert level options to the command staff section and lets command staff use them.  This matches Polaris behavior and pre-TGUI behavior.  Fixes https://github.com/VOREStation/VOREStation/issues/9212 . Also changes "Site Director-Only Actions" to "Site Manager-Only Actions" for consistency with the name used for that role in other places.
 2020-10-13 00:45:44 +01:00
Verkister
065ac1997b Fixes dogborg cell lick recharge. 
It was using the cell's maxcharge instead of actual charge, meaning that even empty cells would give charge and overcharged cells were completely ignored.
 2020-10-12 12:27:51 +03:00
Andromeda-K22
205aa28d87 changes emotes to use a textbox (#7695) 2020-10-12 00:02:53 -04:00
Andromeda-K22
0761d550ca Tweaked wall radiation calculation (#7696) 
* changes rwall radiation resistance calculation

* removes errant line
 2020-10-12 00:02:41 -04:00
Verkister
183bf990a4 Fixes prone turning for tall species 
Aligns the prone icon flip to properly compensate the offsets for 64p tall species
 2020-10-10 13:58:37 +03:00
KasparoVy
880f014d7c Fixes Only One Accessory Equipped at Spawn & in Character Preview 
Ported from Aurora PR#10205, credit to fernerr

Now you can see all the accessories (within standard equipping logic) you've selected in the character preview.

Addditionally, these accessories will now all be equipped when you spawn instead of filling your backpack unless it's actually necessary.
 2020-10-08 18:15:17 -04:00
Rykka
c39ee6c2f3 Updates File to match current Virgo-Erigone Lore at Dragor's Request 2020-10-07 16:17:59 -04:00
Rykka
f8a3e91178 Adds Virgo-Erigone, Virgo 3b Colony and Virgo 4 NT Compound as home/citizenship options 2020-10-07 15:56:25 -04:00
Novacat
ed708832c5 Merge pull request #9178 from VOREStation/Verkister-patch-1 
Small item digestion fix/tweak
 2020-10-07 03:59:21 -04:00
TheFurryFeline
01da31bc0f Panel ex_act resist, too 
Also fixing indentation a bit. Derp.
 2020-10-06 22:19:38 -04:00