cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 23:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,632 Commits 8 Branches 26 Tags
f0d5fcc5a48d200ada40bb4cdfe16a28b9106ae4
Commit Graph

13542 Commits

Author SHA1 Message Date
Jon
f0d5fcc5a4 Removes "Long Hair Alt" and "Shoulder Length Hair Alt" as they are identical to "Longer Fringe" and "Long Fringe" respectively. By identical to, I don't mean the sprites are the same - I mean they reference the exact same sprite! This has been a thing for a long time, for my knowledge, so people that have it set in their preferences may get some unexpected baldness - they should be able to fix that with mirrors fine if they don't notice before joining, though. 2016-03-02 22:19:15 +00:00
Kelenius
b9a9a7eb88 Merge branch 'master' into botFixes 2016-03-01 14:48:24 +03:00
Hubblenaut
0cdde3493c Fixes cash mashine department linking on spawn 2016-02-28 22:35:50 +01:00
Hubblenaut
a844828f23 Fixes Cash Machines not connecting to account on spawn and having omnidirectional interaction area 2016-02-28 22:16:23 +01:00
EmperorJon
f53ea1f9c5 Merge pull request #1096 from Neerti/2/28/2016_id_computer_fix 
Fixes ID computers.
 2016-02-28 14:45:57 +00:00
Neerti
69140184b3 Fixes ID computers. 
Also fixes what appears to be a merge error in condiments, which made my compiler complain.
oh, someone also added FILE_DIR previously, as well.  Fixed that too.
 2016-02-28 08:08:23 -05:00
Neerti
d7547ac702 Merge pull request #1095 from EmperorJon/27_Feb._AFK 
Adds a timer to staffwho AFK notifications.
 2016-02-28 07:13:56 -05:00
EmperorJon
5fb4a26a0b Merge pull request #1093 from redstryker/Hijabs 
Adds hijabs
 2016-02-27 22:07:43 +00:00
Jon
f20713e668 Adds a timer to staffwho AFK notifications. 2016-02-27 21:57:40 +00:00
Neerti
c7e9acbdad Merge pull request #1082 from Datraen/FlaregunMech 
Adds a mech flare launcher, can be mounted on any mech.
 2016-02-26 22:29:47 -05:00
Neerti
23b15390dd Merge pull request #893 from Kelenius/AIHud 
AI hud
 2016-02-26 20:31:40 -05:00
redstryker
9873eddf7e Update loadout_head.dm 2016-02-26 16:21:04 -05:00
redstryker
df5e980843 Adds hijabs as a head item and a loadout item. 2016-02-26 16:17:56 -05:00
Datraen
9fdce4ec34 Merge pull request #988 from Zuhayr/cards 
Cards Against The Galaxy.
 2016-02-26 14:39:59 -05:00
Hubblenaut
6ee464cae7 Merge remote-tracking branch 'upstream/master' into cash 2016-02-26 13:48:01 +01:00
Datraen
aa3dc42246 Merge pull request #1090 from Hubblenaut/condiments 
Fixes condiment placement
 2016-02-26 07:39:39 -05:00
Hubblenaut
1a212ed96f Fixes condiment placement 2016-02-26 12:24:36 +01:00
Datraen
96550f8ee3 Merge pull request #1031 from Yoshax/paifix 
pai bug fix + changes
 2016-02-25 23:07:46 -05:00
Kelenius
19782d5b10 Fixes AI eye in nullspace bug 2016-02-25 16:21:54 +03:00
Datraen
55a024ef14 Adds a mech flare launcher, can be mounted on any mech. 2016-02-24 21:15:48 -05:00
Neerti
7ab933f616 Merge pull request #1077 from Datraen/LoadoutNameFix 
Makes the loadout screen use the display name instead of the item name.
 2016-02-24 17:36:41 -05:00
Datraen
1286bd8afa Makes the loadout screen use the display name instead of the item name. 2016-02-24 17:00:40 -05:00
Datraen
ce0471ca1c Returns mod access to the paralyze verb. 2016-02-24 15:22:10 -05:00
Datraen
793045b053 Returning 1 causes module switching to run twice. 2016-02-23 17:21:25 -05:00
Mark9013100
1928b102e9 Fixes the RIG grenade launcher icon 2016-02-23 09:37:57 -05:00
Hubblenaut
491a83ca72 Adds prices for snacks and drinks 2016-02-22 17:34:23 +01:00
Mark9013100
c9dfdb74f5 Removes unnecessary line for evidence bag boxes 2016-02-22 05:48:54 -05:00
Zuhayr
5a5fb216c8 Added legal notice. 2016-02-22 09:40:03 +10:30
Zuhayr
7d83a629b0 Added Cards Against The Galaxy. 2016-02-22 09:40:02 +10:30
Datraen
b4a89e1acf Merge pull request #1052 from RusskiSam/resting-mice 
Removes unnecessary code for mouse rest...
 2016-02-21 16:52:31 -05:00
RusskiSam
e142728474 Removes unnecessary code for mouse rest... 
...Or how rookies don't know simple things.
 2016-02-22 00:32:53 +03:00
Hubblenaut
68495d8727 Postmerge fixes 2016-02-21 19:31:04 +01:00
Hubblenaut
c22f9b2996 Merge remote-tracking branch 'upstream/master' into cash 2016-02-21 17:48:19 +01:00
Datraen
b154b2c3be Merge pull request #1000 from RusskiSam/resting-mice 
Minor - Mouse players can now "rest" properly
 2016-02-21 11:35:40 -05:00
Datraen
5cb69f01a3 Merge pull request #1029 from Kelenius/dankMemes 
Sprites for drying racks, bees for hydroponics
 2016-02-21 11:33:16 -05:00
Datraen
da3b0af760 Merge pull request #1035 from Yoshax/typofix 
Fixes #1034
 2016-02-21 11:31:45 -05:00
Hubblenaut
60f5358751 All cash now acts like bundles 2016-02-21 17:23:54 +01:00
Hubblenaut
67884b97b5 Adds cash registers and retail scanners 2016-02-21 16:46:56 +01:00
PsiOmegaDelta
afdafb3862 Makes the into-resist proc solely responsible for checking click delays. 
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839. Fixes #12062. Fixes #12114.
 2016-02-21 12:45:01 +00:00
Kelenius
8010b014cf Merge branch 'master' into dankMemes 2016-02-21 14:20:03 +03:00
Neerti
d85b8f95f6 Merge pull request #1044 from Nalarac/master 
Adds welding goggles to autolathes.
 2016-02-21 04:57:55 -05:00
Neerti
c0ad435650 Merge pull request #1043 from Zuhayr/teshfix 
Fixes halloss and oxyloss for species with low health values.
 2016-02-21 04:57:04 -05:00
Neerti
280fad7c0f Merge pull request #1045 from Woodratt/1.4.7_bar_hotfix 
1.4.7 Bar Nerfs
 2016-02-21 04:56:41 -05:00
Neerti
93dd32f1b2 Merge pull request #1037 from Yoshax/dolladolla 
Changes predefined space cash stacks to be bundles
 2016-02-21 04:48:00 -05:00
Zuhayr
ebd2360f43 Merge pull request #1004 from Kelenius/master 
Monkey cubes now expand in showers
 2016-02-21 17:49:46 +10:30
Zuhayr
560e6a0ffc Merge pull request #992 from Neerti/2/14/2016_ling_nerfs_and_ear_protection_cleanup 
Ling nerfs, ear protection cleanup, and ling bugfixes.
 2016-02-21 17:48:44 +10:30
woodratt
7b1b4d081b 1.4.7 Bar Nerfs 
- Fixed wrong plating around the research break area.
- Navi beacons added to the central hallway, Beepsky sold separately.
- Newer smaller bar added, second spawn for bartender added. Button to lock the doors to and from the bar added to the security checkpoint.
- Garden Camera added for seeing the center of the park.
- Mule drop off point in medical added.
- Scrubbers and vents added to the CE's Office.
- Disposals on the research outpost linked to the outlet.
- Minor layout change in the warden's office.
- 2x more sunglasses added to maintenance.
- 2x more Welding goggles added to engineering, seriously I'm not adding anymore.
- Added a extra mop and bucket to the janitor's closet.
- Space heaters now available in hard storage for engineering.
- Fixed black tiles on Tcomms.
- All existing deck of cards on the main z-level should properly be a deck of cards and not null.
 2016-02-20 21:26:37 -08:00
Zuhayr
548965dbd9 Fixes halloss and oxyloss for species with low health values. 2016-02-21 15:43:57 +10:30
Andrew
e86ed849a9 Update glasses.dm 2016-02-20 21:37:40 -06:00
Yoshax
76db1f5e6c Changes predefined space cash stacks to be bundles 
Fixes #926
 2016-02-21 02:16:14 +00:00