cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 18:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,610 Commits 2 Branches 1 Tag
df5e980843315edc3d55ece30214923998b6335c
Commit Graph

22103 Commits

Author SHA1 Message Date
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
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
sabess
cb1e26ec70 Fixed conflicts with another thing. 2016-02-21 22:48:56 +11: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