Commit Graph
29619 Commits
Author SHA1 Message Date
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 91d59ccd64 Merge pull request #1078 from Yoshax/mapfixerino
Adjusts odd light fixture - Fixes #1071
2016-02-26 14:37:32 -05:00
Datraen 823eccb736 Merge pull request #1079 from Yoshax/sugarohsugar
Adjusts ordering of sugercane sprites - Fixes #1064
2016-02-26 14:37:21 -05:00
Datraen 85f1c260f2 Merge pull request #1085 from Yoshax/pipingfix
Re-adds four way manifold to port first aid hallway - Fixes #1081
2016-02-26 14:37:12 -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
Datraen b7eba8ea69 Merge pull request #1050 from Hubblenaut/cash
Adds Cash Registers, Retail Scanners and Prices
2016-02-26 08:03:57 -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
Neerti f08d797105 Merge pull request #1086 from Datraen/doubleemotefix
Gets rid of double emotes on pAIs and AIs.
2016-02-25 19:01:05 -05:00
Datraen 47efe8d217 Gets rid of double emotes on pAIs and AIs. 2016-02-25 12:39:00 -05:00
Yoshax 23f0ac3e17 Fixes #1081 2016-02-25 16:40:04 +00: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 767a6e7c28 Merge pull request #1080 from EmperorJon/24_Feb._NanoUI_map_update
Updates the NanoUI map
2016-02-24 18:30:10 -05:00
Jon 89f9ab1df3 Updates the NanoUI map (nanomap_z1.png) 2016-02-24 23:04:29 +00: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
Yoshax 3aae800f7c Fixes #1064 2016-02-24 22:27:57 +00:00
EmperorJon 4018416a14 Merge pull request #1076 from Datraen/ParalyzePermFix
Returns mod access to the paralyze verb.
2016-02-24 22:24:58 +00:00
Yoshax 97ef04d6ac Fixes #1071 2016-02-24 22:24:04 +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
Datraen ce535afdef Merge pull request #1067 from Yoshax/doorsarefun
Fixes #1053
2016-02-24 11:33:42 -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 f6ecc9e193 Merge pull request #1068 from Minijar/First_aid_posts
First aid posts BOOGALOO
2016-02-23 19:02:49 -05: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
Yoshax 2aec9643c9 Fixes #1053 2016-02-23 20:11:21 +00:00
EmperorJon 28af55a401 Merge pull request #1063 from Mark9013100/2/23/2016riggl
Fixes the RIG grenade launcher icon
2016-02-23 17:21:25 +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
Neerti 7ce395b894 Merge pull request #1056 from Mark9013100/2/22/2016arcadedescfix
Fixes the description for the Orion trail machine
2016-02-22 06:03:06 -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