cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,910 Commits 8 Branches 26 Tags
3a45ceee6412db103cf9ec276e76142bb9e7d90f
Commit Graph

22330 Commits

Author SHA1 Message Date
Hubblenaut
3a45ceee64 Full fertilizer bottles of type glass/bottle 2016-03-30 19:42:13 +02:00
PsiOmegaDelta
877e3d66df Makes loadout datums more flexible. 
Loadout item definitions can now also take a list of tweaks, which will adjust the item after spawn.
Currently includes color and icon state changes.
 2016-03-30 16:46:14 +01:00
EmperorJon
5e05d6b91a Merge pull request #1293 from Yoshax/progressbars 
Adds progress bars to tasks that take time
 2016-03-30 15:15:00 +01:00
EmperorJon
2bb4f43166 Merge pull request #1237 from Hubblenaut/grabpull 
Removes people being able to pull from somebody's grab
 2016-03-30 15:07:25 +01:00
Neerti
015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes 
Map fixes, minor edits
 2016-03-30 02:25:35 -04:00
Neerti
e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs 
Adds Navy Blue scrubs
 2016-03-30 02:24:07 -04:00
Neerti
a9b2e7a61e Merge pull request #1133 from Kelenius/coolBots 
Overhauls bot AI
 2016-03-30 02:23:28 -04:00
Neerti
396016becc Merge pull request #1247 from Yoshax/gamemodenames 
Renames mixed gamemodes to have descriptive names
 2016-03-30 02:22:32 -04:00
Neerti
9ee12bcc6c Merge pull request #1129 from Kelenius/voteUpdate 
Cleans up and updates votes
 2016-03-30 02:21:54 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Yoshax
5b225ba765 Fixes subtype 2016-03-30 00:28:38 +01:00
PsiOmegaDelta
84799befca Can now toggle the progress bar visibility. 
Enabled  by default.
 2016-03-30 00:13:41 +01:00
EmperorJon
547b4994da Merge pull request #1292 from Yoshax/saltfix 
Fixes Deadchat
 2016-03-30 00:03:41 +01:00
Yoshax
c1e69fd8a3 Adds a missing ! 2016-03-29 23:55:27 +01:00
EmperorJon
b513e4be92 Merge pull request #1288 from Mark9013100/3/29/2016riothelmedit 
Minor change to riot helm code
 2016-03-29 23:53:33 +01:00
Neerti
274df7339f Adds missing ..() to recharger's new() 2016-03-29 17:56:00 -04:00
Datraen
3809e92adf Merge pull request #1214 from Yoshax/morepreferences 
Makes it possible to have more than 16 preferences
 2016-03-29 14:44:47 -04:00
Mark9013100
a7b6bf1960 Minor improvement to riot helm code 2016-03-29 12:43:07 -04:00
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
Neerti
905601cf17 Merge pull request #1282 from Datraen/EyeDisabilityFix 
Fixes a check to vision if there is a lack of eyes.
 2016-03-29 00:54:37 -04:00
Datraen
f2e9601400 Fixes a check to blind if there is a lack of eyes. Broken eyes are already handled in their process. 2016-03-29 00:36:38 -04:00
Neerti
33ce9814f2 Merge pull request #1269 from Anewbe/patch-2 
Balances Cult Hoods
 2016-03-29 00:03:03 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Mark9013100
f57eef764f Bedsheets can be worn as capes 2016-03-28 22:01:37 -04:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master 
Adds wallets to loadout menu
 2016-03-28 12:49:57 -04:00
Yoshax
db1a5021bc Corrects error in a span ckass 2016-03-28 17:19:03 +01:00
Neerti
0a35a861b6 Merge pull request #1266 from Mark9013100/3/27/2016hostrench 
Ports /tg/'s armored trenchcoat sprite
 2016-03-28 00:21:40 -04:00
Neerti
ac8ad8bb08 Merge pull request #1270 from Datraen/MicrowaveFix 
Microwaves no longer try cooking their components while cooking.
 2016-03-28 00:20:36 -04:00
Mark9013100
26358bf1ab Map edits, minor fixes 2016-03-28 00:02:20 -04:00
Datraen
71eef5d58b Resolves Travis' build errors. 2016-03-27 16:02:59 -04:00
Datraen
725ff4d03f Microwaves no longer try cooking their components while cooking. 2016-03-27 15:49:06 -04:00
Anewbe
0ec85a0af6 Update cult_items.dm 
Trying to fix a Travis thing.
 2016-03-27 13:44:36 -05:00
Anewbe
c5228b1758 Balances Cult Hoods 
- Gives Cult Hoods the same armor values as the robes
 2016-03-27 13:29:33 -05:00
EmperorJon
3026361ff4 Merge pull request #1231 from Neerti/3/22/2016_self_objectives 
Adds a new optional 'ambitions' system.
 2016-03-27 17:38:22 +01:00
Mark9013100
f95cbbdc4a Ports /tg/'s armored trenchcoat sprite 2016-03-27 07:06:01 -04:00
Neerti
ddf4cceb96 Merge pull request #1260 from Datraen/BuckleResistFix 
Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time.
 2016-03-26 20:51:08 -04:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Datraen
f8825f1752 Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time. 2016-03-26 18:33:46 -04:00
Neerti
0844d0b9f0 Merge pull request #1239 from Mark9013100/3/23/2016layering 
Layering fixes for bedsheets/curtains
 2016-03-26 17:06:54 -04:00
Neerti
36096643fc Merge pull request #1244 from Mark9013100/3/24/2016combatjumpsuit 
Adds sprites for the combat turtleneck
 2016-03-26 17:02:21 -04:00
Neerti
13b255f43c Merge pull request #1259 from Datraen/BayLifePick 
Baystation12 Life Improvement Port
 2016-03-26 17:01:55 -04:00
Datraen
ca2e45cc3e Resolves conflicts with Baystation12/Baystation12#12276 2016-03-26 16:35:31 -04:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update 
Construction update
 2016-03-26 15:45:19 -04:00
Neerti
57b6fe7aa8 Merge pull request #1169 from Kelenius/fixesOnly 
Axes old wire, fixes costs in lathe
 2016-03-26 15:42:25 -04:00
Chinsky
98750f20ba Removed some duplicated code for clearer readability. 
Fixed cold air giving high temperature traces.
 2016-03-26 15:41:27 -04:00
Chinsky
96fd04374a Makes unused code use jitterness proc. 
Fixes life assuming that if we don't have eyes, we never had em.
 2016-03-26 15:41:25 -04:00
Chinsky
87395fd6c2 Shortens some wordy procs that used a lot of duplicate code with power of OOP 2016-03-26 15:40:36 -04:00
Neerti
655a7b08e2 Merge pull request #1258 from Datraen/PDAManifestFix 
Removes JSON encoding of PDA Manifest list.
 2016-03-26 15:38:32 -04:00
Neerti
30dadef6e9 Merge pull request #1255 from Anewbe/patch-1 
Leg Guard fixes
 2016-03-26 15:37:34 -04:00
Neerti
35b1de1460 Merge pull request #1254 from SparklySheep/patch-1 
Gives the Roboticist a full toolbelt on roundstart.
 2016-03-26 15:36:41 -04:00