EmperorJon
78c53866c2
Merge pull request #1150 from Kelenius/noSplash
...
Removes splash code
2016-03-11 20:47:40 +00:00
Kelenius
03a8b46e97
Fixes a roundstart runtime
2016-03-11 12:16:24 +03:00
Kelenius
974a2a8216
Removes splash code
...
Unused
2016-03-10 10:55:35 +03:00
Kelenius
069a2e52a9
Fixes #1145
...
Restores 'AI IM' verb tab
2016-03-10 10:30:07 +03:00
Neerti
d412c0a070
Merge pull request #1134 from Kelenius/moreDrills
...
Constructible drills
2016-03-09 20:52:58 -05:00
Mark9013100
4963d5a858
New combat helmet sprite
2016-03-08 21:37:04 -05:00
Datraen
be4564d30e
Merge pull request #1128 from Hubblenaut/cash
...
Retail Scanner, Fixes and QOL
2016-03-08 16:40:02 -05:00
Datraen
bddc51e657
Merge pull request #1125 from Neerti/2/28/2016_armor
...
A Load of Armor Changes
2016-03-08 16:32:42 -05:00
Kelenius
63e8fbab46
Constructible drills
...
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
2016-03-08 20:46:31 +03:00
Hubblenaut
0a85f0c0fa
Retail Scanner QOL
...
Adjusts Size to fit in pocket
Fits in belt slot
Adds technology level for deconstructor (MT 1)
Ability to swipe when shown by show_held_item
2016-03-07 19:50:49 +01:00
Hubblenaut
dc092aa348
Changes interface to using /interact and provided procs
2016-03-07 18:34:38 +01:00
Hubblenaut
42c73e1c8b
Fixes ethanol drink pathing
2016-03-07 17:05:30 +01:00
Neerti
daf632ddc3
Fixes Teshari Permastun
...
The game had it hardcoded to set halloss to 99, while it triggers for teshari at 50, resulting in an infinite loop.
2016-03-06 06:55:56 -05:00
Neerti
2420ed3867
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor
2016-03-06 04:19:33 -05:00
Neerti
d4793de3a0
Adds a bunch of stuff for sec armor. See PR for details.
2016-03-06 04:18:39 -05:00
Jon
dd0c03c861
Sol Government faxes now go to the Sif Governmental Authority. No more sending faxes to the UN/NATO. :P
2016-03-05 20:49:31 +00:00
Neerti
b4b8d94723
Merge pull request #1015 from Zuhayr/xenosremove
...
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti
6224e978a9
Merge pull request #1014 from Zuhayr/voxremove
...
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
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
