cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-04-30 03:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,616 Commits 13 Branches 26 Tags
b3dc5744ca3d2fdffabf367a2f5a7bac05bebb85
Commit Graph

27457 Commits

Author SHA1 Message Date
Unknown
be87675c03 Tones it back a bit. 2021-06-22 12:24:18 -04:00
Unknown
4ab52cd52e Nerfs ghetto surgery on staff request 2021-06-22 12:08:37 -04:00
Unknown
10bcf6e55c Adds missing comment 2021-06-22 11:23:30 -04:00
Unknown
109c8bc15a Maybe too much of a buff in this case 2021-06-22 11:20:05 -04:00
Unknown
e5891bc972 More medicine fixes 2021-06-22 11:13:18 -04:00
Unknown
e3d33334d6 Buffs Adminordrazine, Myelamine 
- Increases the effects of Myelamine
- Increases the effects of Bicaridine Overdose
- Tries to fix Adminordrazine to be less useless
 2021-06-22 10:27:14 -04:00
Aronai Sieyes
0051e96509 Merge pull request #10610 from VOREStation/Arokha/machinerybreak 
Makes machinery destroyable by projectiles
 2021-06-21 22:48:40 -04:00
Aronai Sieyes
a8f228bc02 Maybe fixes heroman's complaint 2021-06-21 21:48:01 -04:00
Aronai Sieyes
0fa3c76cc7 Merge branch 'master' into Arokha/machinerybreak 2021-06-21 11:11:31 -04:00
Aronai Sieyes
afbda65f22 Merge pull request #10608 from VOREStation/Arokha/emittersprites 
Port emitter sprites
 2021-06-21 11:07:07 -04:00
Novacat
c8e037812d Merge pull request #10682 from VOREStation/upstream-merge-8143 
[MIRROR] Code fixes + refactors who/staffwho
 2021-06-20 22:58:44 -04:00
Novacat
a0133817ae Update who.dm 2021-06-20 22:47:01 -04:00
Novacat
aa6813419b Merge pull request #10716 from VOREStation/upstream-merge-8144 
[MIRROR] Indescribable! - A Food Flavor Fixing Pass
 2021-06-20 22:39:32 -04:00
Novacat
2e1a706c27 Update who.dm 2021-06-20 22:32:17 -04:00
Novacat
3b3c4f190f Update snacks.dm 2021-06-20 22:20:45 -04:00
Atermonera
8b2dc21e4e Merge pull request #8143 from MarinaGryphon/more-linter 
Code fixes + refactors who/staffwho
 2021-06-20 19:50:13 -04:00
Novacat
79eefa9f83 Merge pull request #10714 from TheDavestDave/master 
stops handbow changes overiding engery bow
 2021-06-20 17:43:42 -04:00
Verkister
2723b114eb Fixes synthetic var not getting cleared on load (#8148) 
Fixes synthetic var not getting cleared when loading character slots. Due to the char setup mannequin's nature of being a single same mob just getting its properties loaded from save slots, loading/making a synth character would permanently mess up the var for all non-synth chars on the roster and cause issues with synth-related settings because there was nothing in the code to clear the var.
 2021-06-20 16:52:43 -04:00
MarinaGryphon
d6d18c9d30 Indescribable! - A Food Flavor Fixing Pass 2021-06-20 16:51:24 -04:00
TheDavestDave
a88766387d stops handbow changes overiding engery bow 
I didn't know it existed
 2021-06-20 20:16:32 +01:00
Novacat
89ed203456 Merge pull request #10635 from PastelPrinceDan/pandoracoat 
Pandora029 fluff item
 2021-06-20 13:39:20 -04:00
Aronai Sieyes
21443e37f3 Merge pull request #10709 from Novacat/nova-basicfixes 
Phaser tweaks and bugfixes
 2021-06-20 12:55:07 -04:00
Hatterhat
7aa98d0c10 what the fuck even is waste 2021-06-20 08:05:43 -05:00
Unknown
40b6fa692f Phaser tweaks and bugfixes 
-Slightly increases the energy cost of low power phaser modes.
-Fixes a typepath error for unlocked phaser bows
-Fixes a typo in phaser bows
 2021-06-19 20:40:41 -04:00
ShadowLarkens
1df281c0f3 Fix warning in recipe.dm 2021-06-19 14:34:50 -07:00
Novacat
65ba367501 Merge pull request #10686 from VOREStation/upstream-merge-8146 
[MIRROR] Removes Global Iterators
 2021-06-19 09:43:39 -04:00
Novacat
c8ede566f3 Merge pull request #10694 from VOREStation/upstream-merge-8140 
[MIRROR] Refactors utensils to use weakrefs
 2021-06-19 09:43:30 -04:00
Novacat
11d28d72ce Update snacks.dm 2021-06-19 09:23:17 -04:00
Novacat
27453f5694 Merge pull request #10695 from VOREStation/upstream-merge-8141 
[MIRROR] Improves select_recipe.
 2021-06-18 23:38:07 -04:00
MarinaGryphon
005c75fa4e Improves select_recipe. (#8141) 
* select_recipe improvement

Removes the call to Timsort and the recipe comparator proc;
uses a handrolled implementation of
`argmax(items + reagents + fruit)` instead.
This reduces the memory footprint of `select_recipe`
as well as the amount of processing needed to select the optimal recipe.

* angelogchay
 2021-06-18 19:06:54 -04:00
MarinaGryphon
7ee772f6e7 Refactors utensils to use weakrefs 2021-06-18 19:02:33 -04:00
Atermonera
8adb8a2b85 Merge pull request #8138 from Verkister/patch-72 
fixes coughs screaming in the chat
 2021-06-18 18:37:44 -04:00
Novacat
a89400c8e6 Merge pull request #10691 from TheFurryFeline/TFF-Pink_Russian-ise_Drink_Completion 
Fix metaglass stuff
 2021-06-18 17:41:02 -04:00
TheFurryFeline
3b3df27dac Fix metaglass stuff 
The conversion to Pink Russian PR overlooked this metaglass portion. Fixy.

~Also sneaking in map file name fixes because OCD, kek. 5-8-9 = no. 5-6-7 = yes.~
 2021-06-18 17:00:11 -04:00
Anthony Rodriguez
71303a2069 Syncing 2021-06-18 13:43:26 -07:00
MarinaGryphon
c05a5c8f5e Removes Global Iterators 2021-06-18 14:07:16 -04:00
Aronai Sieyes
e749537a98 Merge pull request #10683 from VOREStation/Arokha/runtimes 
6 fixes
 2021-06-18 14:01:58 -04:00
Aronai Sieyes
e9dc0d8412 center_of_mass should be a list 
Runtimes!
 2021-06-18 13:37:11 -04:00
Aronai Sieyes
def744f2a6 Fix light runtimes with helmets 2021-06-18 13:37:01 -04:00
Aronai Sieyes
663ba3134a Fix gateway key not spawning 2021-06-18 13:36:44 -04:00
Aronai Sieyes
1eb0154a4d Telecube runtime 
Turfs can't be anchored
 2021-06-18 13:36:35 -04:00
Aronai Sieyes
c88dfac7f8 Make fake sun invisible 2021-06-18 12:26:40 -04:00
Verkister
aaaa9413ad Couple item digestion tweaks. 
Makes oxy damage not affect item digestion. Kinda silly to choke something that doesn't breathe.
Also slightly buffs food item reagent gain because 30% is just kinda pathetic.
 2021-06-18 12:57:35 +03:00
Novacat
601786bd0a Merge pull request #10636 from ShadowLarkens/tgui_updates 
TGUI 4.3
 2021-06-18 00:22:16 -04:00
Novacat
8b447d8b1d Merge pull request #10662 from VOREStation/Arokha/lights2 
Port current /tg/ lighting system
 2021-06-18 00:21:58 -04:00
Aronai Sieyes
c2b99d5916 VS: Requested fixes 2021-06-17 23:52:45 -04:00
Aronai Sieyes
05fc5d3758 Fix requested things 2021-06-17 23:52:39 -04:00
Novacat
86344e2197 Merge pull request #10672 from TheFurryFeline/patch-33 
Late Spell Check
 2021-06-17 20:10:36 -04:00
TheFurryFeline
2ba31a694e Late Spell Check 
Missed one of my self-appointed spell checks for a friend contributor's PR and here I am to do it. D'oh.
 2021-06-17 20:01:23 -04:00
R3dtail
fd8ec6a27a Bigger Bellies 2021-06-17 18:41:20 -05:00