cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,857 Commits 9 Branches 26 Tags
7a437e12f54d4e4e4118b43a084656d33175a704
Commit Graph

22288 Commits

Author SHA1 Message Date
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
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master 
Adds wallets to loadout menu
 2016-03-28 12:49:57 -04: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
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
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
Datraen
c09bb6d807 Removes JSON encoding of PDA Manifest list. 2016-03-26 15:31:08 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis 
Attempts to port bay's travis update attempts
 2016-03-26 13:18:55 -04:00
Anewbe
d4f7a366d8 Leg Guard fixes 
- Unathi and Taj should now be able to wear the leg armors
- The specialized leg armors should now have the appropriate armor values, rather than all sharing the one for laserproof
 2016-03-25 22:14:41 -05:00
SparklySheep
ad5e67783e Gives the Roboticist a full toolbelt on roundstart. 
It's annoying to load up a toolbelt every roundstart as a roboticist. This is a quality of life change so the roboticist can get to doing robotics stuff instead of filling up the toolbelt every round start.
 2016-03-25 22:02:08 -05:00
SinTwo
f0487bc6b4 Reagent Dispenser Update 2016-03-25 16:59:07 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Yoshax
288be19de4 Changes some antag items to not have 'suspicious' in their name 2016-03-25 19:28:49 +00:00
Mark9013100
03d1fbcf10 Gives the QM a proper stamp 2016-03-24 14:52:55 -04:00
Neerti
faf538a832 Merge pull request #1246 from Datraen/XenoarchSpawnFix 
Fixes a check in xenoarch master controller.
 2016-03-24 12:17:07 -04:00
Datraen
4c9c5e5870 Fixes a check in xenoarch master controller. 2016-03-24 10:17:26 -04:00
Neerti
dfb6ea7071 Merge pull request #1241 from Mark9013100/3/23/2016magstorage 
Armor can now hold maglights
 2016-03-24 09:06:51 -04:00
Mark9013100
e87f19da39 Adds a sprite for the combat turtleneck 2016-03-24 03:22:53 -04:00
Neerti
b457b54b02 Merge pull request #1234 from Yoshax/IB 
Fixes IB surgery not checking for open ribs etc
 2016-03-23 20:42:48 -04:00
Neerti
3e45f9f727 Merge pull request #1235 from Yoshax/watercooler 
Watercooler can be wrenched/unwrenched now
 2016-03-23 20:28:12 -04:00
Mark9013100
5f734effbc Armor can now hold maglights 2016-03-23 20:14:56 -04:00
Mark9013100
200057397a Layering fixes for bedsheets/curtains 2016-03-23 16:19:41 -04:00
Mark9013100
ce1e4bc33b Capitalizes pill description. 2016-03-23 16:09:21 -04:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax
eb085f1160 Adjusts lightswitch light cost 2016-03-23 13:43:34 +00:00
Atlantis
3e0c5f2e49 Light switches now glow 
- Adds a relatively weak light to light switches (slightly weaker than a light bulb), so it is not that hard to find them when the room is dark. Colour can be red or green depending on whether the light switch is turned on or off.
- Increases light switch power usage to 20 Watts. For comparsion, a light bulb has 60 so it feels apropriate.
- Light switches now run off LIGHT APC channel rather than EQUIP.
- Updated: Light switches now layer above darkness when powered. Light intensity slightly reduced.
 2016-03-23 13:23:10 +00:00
Brian Cook
9edc1dd549 Watercooler can be wrenched/unwrenched now 
Fixed capitalization in some cases
 2016-03-23 13:13:54 +00:00
Chinsky
2ad91fc60c Fixes IB surgery not checking for open ribs etc 
Guess it wasn't updated after Zuh's encased changes
 2016-03-23 13:08:08 +00:00
Neerti
1f5a7ea1f2 Adds a new optional 'ambitions' system. Players can set custom objective-like goals for themselves, which everyone can see at the end of the round. 2016-03-22 23:14:00 -04:00
Mark9013100
e62863e1b3 Renames the security .45 2016-03-22 23:03:21 -04:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup 
Mob inventory cleanup
 2016-03-22 21:42:27 -04:00
Neerti
9027b0f391 Merge pull request #1221 from Ithalan/master 
Fixes Anomaly Analyzer reading the wrong variable for the artifact effect's range
 2016-03-22 21:36:42 -04:00
Neerti
0891eba8cd Merge pull request #1207 from Datraen/GTStationWide 
Adds a check to the greytide virus to see if the APCs are operating.
 2016-03-22 21:36:35 -04:00