cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,835 Commits 8 Branches 26 Tags
690dc5cbecdafb59df8753bfae72176e3d2f8e54
Commit Graph

22192 Commits

Author SHA1 Message Date
Sebbe9123
79345970e4 Adds space mobs. Mimic, snake(noodle), Gaslamp. 2019-01-21 09:12:03 +01:00
Neerti
d4baa2df07 Allows borgs to move up and down with jetpacks 2019-01-21 02:58:07 -05:00
Atermonera
5198d52c4a Fixes Teshari hardsuits + adds sprites for most 2019-01-20 23:33:04 -05:00
Neerti
d3a73ba066 Merge pull request #5885 from Atermonera/botspeak 
Bots don't speak gibberish
 2019-01-20 02:48:12 -05:00
Neerti
613f2015ff Merge pull request #5870 from Anewbe/more_emote_fixes 
Borgs can use audible emotes again
 2019-01-19 18:21:38 -05:00
Neerti
b5790fca21 Merge pull request #5859 from Anewbe/emote_fix 
Audible emotes can be used again
 2019-01-18 18:15:39 -05:00
Anewbe
8e9e83fde0 Merge pull request #5858 from Atermonera/suitcooler_pressurization 
Suit coolers don't overheat in vacuum
 2019-01-18 09:15:04 -05:00
Atermonera
c064271fb3 Merge pull request #5843 from Anewbe/gibberish 
Adds Gibberish
 2019-01-16 22:46:41 -05:00
Anewbe
dbc6e20b19 Merge pull request #5840 from Hatterhat/protolathe-qol 
protolathe screen updates mat cost with better manips
 2019-01-16 17:23:44 -05:00
Anewbe
916e32e9eb Fixes a couple of tiny glasses bugs 2019-01-15 15:00:31 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
e1cf31c565 Merge pull request #5835 from Cerebulon/ReligionUpdate 
Updates Religion Lists + Adds Religious Paraphernalia
 2019-01-14 03:47:00 -05:00
Spades
fcff9205e6 Eliminates vorestation edit 2019-01-13 12:27:21 -05:00
Neerti
e28adbfe75 Makes IC ticket response less rude 2019-01-13 02:27:56 -05:00
Neerti
5d102e8ed2 Merge pull request #5828 from Cerebulon/traitorFix 
Fixes antagonist options not appearing in preferences
 2019-01-13 00:29:09 -05:00
Neerti
b43d76b86e Merge pull request #5823 from Anewbe/egun_stun 
Egun stun beams are weaker
 2019-01-13 00:28:56 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Neerti
099ddeff20 Merge pull request #5815 from Heroman3003/eggnog 
Adds eggnog drink to the game.
 2019-01-12 04:29:39 -05:00
Heroman3003
4564605386 Removed is_welder and is_cable_coil 2019-01-12 14:02:15 +10:00
Spades
fb6f5e33ca Corrected commented code 2019-01-11 22:33:53 -05:00
Spades
096ae8e226 Disables Shadekin smite because no shadekin 2019-01-11 22:32:13 -05:00
Spades
1927479ce7 Revert "Moves all old mobs to a legacy mob folder" 
This reverts commit 9a4f291859.
 2019-01-11 21:51:53 -05:00
Spades
9a4f291859 Moves all old mobs to a legacy mob folder 2019-01-11 21:49:43 -05:00
Heroman3003
f76b5631bf Removes the usage of is_multitool proc 2019-01-12 10:07:53 +10:00
Atermonera
46d0277024 Merge pull request #5816 from Anewbe/gun_again 
Guns should once again let people know that they've been fired
 2019-01-09 21:14:49 -05:00
Spades
fc959cd1e8 Removes redundant files 2019-01-07 09:36:11 -05:00
Anewbe
b5a4a58996 Merge pull request #5790 from Mechoid/Make_Security_Sad 
Drop the number of shots of normal and sec-xeno tasers back down to 5.
 2019-01-06 17:52:23 -05:00
TheFurryFeline
ad065f1aea Boost Belly Limit 
There will now be a maximum of 30 bellies for those crazy enough to spend the time and those too lazy to use text documents for that. >W>
 2019-01-06 14:57:54 -05:00
Anewbe
4e210c4a97 Merge pull request #5809 from Mechoid/FixFixPrometheanLang 
Allows Prometheans to choose Sol Common as a language.
 2019-01-06 13:13:44 -05:00
Verkister
890803e0c6 Fixes movement draining nutrition below negatives 
And these negative numbers were apparently breaking the weight loss and examination messages.
 2019-01-06 15:46:20 +02:00
Spades
fc2f451bd4 Merge pull request #4586 from Verkister/boyidie 
Fixes undefined z-levels shitting caves all over the place
 2019-01-05 17:02:33 -05:00
Spades
1d6d0b75ae Missed one. 2019-01-05 17:01:01 -05:00
Spades
5cb647993c Conflicts resolved, excluding the .dme 2019-01-05 16:38:33 -05:00
Spades
58e4a98a94 Breaks a Vorestation Edit in death.dm 
Nobody wants to help me fix these things so I'm just going to break them
and see what happens.
 2019-01-05 16:35:07 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Verkister
d995b5ae67 Tweaks borg belly passive drain. 
-Disables "life support" passive drain for compactor type modules. (janitor, dozer, science)
-Reduces the passive drain for sleeper and brig-belly while slightly increasing it while the passive crit support is actually enabled.

Just a little bit of a QoL thing to reduce the cost of endo encounters.
 2019-01-05 13:15:14 +02:00
Spades
81f7b979c2 Merge pull request #4628 from Heroman3003/shellguard-fix 
Fixes shellguard-noble sprites not actually having sprites
 2019-01-05 00:04:40 -05:00
Spades
ac93866ddc Merge pull request #4610 from Heroman3003/borg-making-fix 
Fixed creation of borgs through non-spawn method
 2019-01-05 00:03:32 -05:00
Spades
2c288ee62b Merge pull request #4624 from Verkister/patch-30 
Fixes food not getting digested on itemweak.
 2019-01-05 00:01:35 -05:00
Spades
35c54b4324 Merge pull request #4614 from Novacat/nova-heterochromia 
Virgo Language Fixes
 2019-01-05 00:01:15 -05:00
Spades
8c1b8aacb2 Merge pull request #4550 from Zap-zapper/size-im 
Size control implant
 2019-01-04 23:59:17 -05:00
Spades
68401ebe5e Merge pull request #4594 from Novacat/nova-survival 
Ports synth overheating fixes
 2019-01-04 23:58:14 -05:00
TheFurryFeline
2f6b30f297 Holocollar Materials 
Adds to Holocollar entry in the Autolathe, now requires Steel to make.
 2019-01-03 16:56:17 -05:00
Anewbe
781aeddf2d Merge pull request #5802 from Neerti/birb_nerf 
Dragging mobs now causes slowdown
 2019-01-02 17:26:05 -05:00
Heroman3003
cae9207bae Fixes shellguard-noble sprites not actually having sprites 2019-01-03 06:45:22 +10:00
Ketrai
4c62b1abde Fixes nutriment stacking 
Currently cooking the pizza caused the intended amount of nutriment to be too high. This fixes it.
 2019-01-02 00:36:27 +01:00
Ketrai
257a7809d0 Update snacks_vr.dm 2019-01-01 17:39:20 +01:00
Ketrai
1841614d78 Update snacks_vr.dm 2019-01-01 17:05:42 +01:00
Ketrai
681f52123f Update snacks_vr.dm 2019-01-01 16:40:00 +01:00
Ketrai
1c43cfd638 Update snacks_vr.dm 2019-01-01 16:22:29 +01:00