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
Datraen
0b4a730bbe
Merge pull request #1083 from Kelenius/plzNoCard
...
There is now a ten-second delay for carding the AI
2016-02-26 14:36:50 -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
Kelenius
e40a2b59ab
There is now a ten-second delay for carding the AI
2016-02-26 11:02:53 +03:00
Datraen
96550f8ee3
Merge pull request #1031 from Yoshax/paifix
...
pai bug fix + changes
2016-02-25 23:07:46 -05:00
Datraen
47efe8d217
Gets rid of double emotes on pAIs and AIs.
2016-02-25 12:39:00 -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
EmperorJon
915ba747b7
Merge pull request #1075 from Mark9013100/2/24/2016revpop15
...
[DNM] Revolution now requires 15 people to start
2016-02-24 22:28:43 +00: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
Mark9013100
0309f1b764
Revolution now requires 15 people to start.
2016-02-24 11:50:20 -05:00
EmperorJon
33b50087e4
Merge pull request #1070 from Datraen/HardsuitEgunFix
...
Allows Hardsuit Eguns to switch firemodes.
2016-02-24 00:45:45 +00:00
Datraen
793045b053
Returning 1 causes module switching to run twice.
2016-02-23 17:21:25 -05:00
Minijar
7e6d06671a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-02-23 21:14:04 +00:00
Minijar
83113302b9
Adds first aid stations.
2016-02-23 21:13:11 +00: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
Neerti
576615ff79
Merge pull request #1057 from Mark9013100/2/22/2016eboxfixTAKETWO
...
Removes unnecessary line for evidence bag boxes
2016-02-22 06:04:40 -05:00
Mark9013100
c9dfdb74f5
Removes unnecessary line for evidence bag boxes
2016-02-22 05:48:54 -05:00
Mark9013100
6221f69c35
Fixes the description for the Orion trail machine.
2016-02-22 03:29:15 -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
9d269ab470
Merge pull request #1033 from Yoshax/burnbabyburn
...
Allows lighting of smokeables on burning people
2016-02-21 11:32:16 -05:00
Datraen
da3b0af760
Merge pull request #1035 from Yoshax/typofix
...
Fixes #1034
2016-02-21 11:31:45 -05:00
Datraen
f9054370c1
Merge pull request #1046 from Sabess/Sab_Thing
...
Maglights 2.0: Conflict Boogaloo
2016-02-21 11:30:34 -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
36c99aecae
Closet breakout no longer failes early.
...
Caused by req_breakout() always making us quit early if we're already breaking out.
Breakout sound/animation now play after the checks.
Fixes the secure locker break_open() override, which wouldn't update the welded flag and thus keep you imprisoned.
Fixes a couple of bad macros.
2016-02-21 13:57:03 +00: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
sabess
71d8acc2cb
Fixed the damage again, oops.
2016-02-21 23:06:05 +11:00
