cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,524 Commits 2 Branches 1 Tag
0a6d1aa08dc87818c3ab7999b51aedd58d2e10f5
Commit Graph

22795 Commits

Author SHA1 Message Date
Datraen
0031f4f065 Merge pull request #1597 from Yoshax/drinkinglasses 
Gives drinking glasses a material so they have a cost in autolathe
 2016-05-08 11:18:24 -04:00
Yoshax
f9708a2e0e Swaps secret player count for ninja/wizard and ninja&wizard 2016-05-08 16:05:07 +01:00
Yoshax
e2293f1e79 Gives drinking glasses a material so they have a cost in autolathe 2016-05-08 15:51:16 +01:00
Kelenius
1848682784 Satisfies Travis 2016-05-08 17:05:27 +03:00
Yoshax
30bcf94067 Removes for loop and adjusts code 2016-05-08 12:41:38 +01:00
Kelenius
d1743bd54c Fixes broken logs 2016-05-08 14:34:03 +03:00
Arokha Sieyes
45e9b4f10a Removed earlier attempt at color 2016-05-08 03:22:33 -04:00
Arokha Sieyes
b6a602ba9a New Player/Character Setup (Fake)NanoUI 
While I consider Polaris' character setup screen to be mechanically better
than most others, it wasn't prettier. Well. It was a bit. But now it's
more pretty-er.

Used the fake NanoUI 'browser' datum to render the pages for the New
Player panel and the Character Setup screen.
 2016-05-08 03:19:09 -04:00
Datraen
fe97249a79 Merge pull request #1584 from Yoshax/grabanddowners 
Fixes neck-grabs forcing people to lie down, stops people resisting when weakened
 2016-05-07 21:07:18 -04:00
Anewbe
8294c89dd1 Ups borg armor from 60 to 90 2016-05-07 18:00:51 -05:00
Yoshax
4708af3a2e Fixes neck-grabs forcing people to lie down, stops people resisting when weakened 2016-05-07 16:41:01 +01:00
SinTwo
64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes 
Conflicts:
	icons/mob/uniform.dmi
 2016-05-06 21:03:18 -04:00
Datraen
454cc25cba Merge pull request #1526 from sabiram/master 
Cleans up black jumpskirt icon and genericises description
 2016-05-06 20:14:50 -04:00
EmperorJon
8af283c7a3 Merge pull request #1569 from Mark9013100/5/6/2016camera_edits 
Security Camera edits
 2016-05-07 00:35:36 +01:00
EmperorJon
e67e2caa48 Merge pull request #1577 from redstryker/master 
Changes all references to 'Mars University' from 'Mars University' to 'Mojave University'
 2016-05-07 00:35:10 +01:00
Datraen
5cc027aacf Merge pull request #1536 from Yoshax/roboticsandcells 
Remaps robotics and mechbay slightly, other adjusts and adjusts cell charge rate
 2016-05-06 18:46:53 -04:00
SinTwo
8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2016-05-06 18:31:07 -04:00
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -04:00
Yoshax
52d73dbf80 Makes drinking glasses produceable in autolathes 2016-05-06 22:51:18 +01:00
Neerti
01e9e441a6 Merge pull request #1570 from Yoshax/genderfix2 
Fixes gender runtimes
 2016-05-06 16:54:01 -04:00
Yoshax
a8dc172bce Fixes gender runtimes 2016-05-06 20:29:58 +01:00
Neerti
9b0a912db1 Merge pull request #1564 from Hubblenaut/drop_pouches 
Adds drop pouches as alternate webbings
 2016-05-06 15:16:09 -04:00
Hubblenaut
8d7446a3c4 Adds drop pouches as alternate webbings 2016-05-06 21:00:28 +02:00
Mark9013100
7efe14a34d Security Camera edits 2016-05-06 14:27:12 -04:00
Yoshax
92e9b6c25a Adds the ability for vending machines to vend 2 items with a 1% chance 2016-05-06 19:10:00 +01:00
Yoshax
47508187cc Makes smoke grenades last longer and adjusts checks 
- Changes boxes of smokes from 5 to 7 grenades
- Changes mapped in single smoke grenades to boxes
 2016-05-06 17:25:28 +01:00
Yoshax
5b747a98dc Fixes incorrect checks 2016-05-06 01:27:21 +01:00
SinTwo
337e49fdc3 Fixes sleepers and advanced body scanners spitting out their parts. 2016-05-05 15:36:45 -04:00
Yoshax
0abb642a60 Adds the ability to feed telecrystals to emags for more uses 2016-05-05 19:59:36 +01:00
Zuhayr
6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Yoshax
8edba8667d Fixes neuter gender being unsavable in setup 2016-05-05 17:27:53 +01:00
Datraen
4916d03d26 Fixes a switched >>. 2016-05-05 10:44:52 -04:00
Datraen
44edf86ccb Merge pull request #1455 from Yoshax/gendertweak 
Gender tweaks and adjustments
 2016-05-05 10:18:25 -04:00
Neerti
bbf2468688 Adds ability for players to ignore other players. (#1539) 
Players can now choose to not receive messages in OOC and deadchat from specific players, with the Ignore verb, or in the global preferences tab.
Ignores can be reverted with the Unignore verb, or with the global preferences tab as well.
This has no effect on IC chat. LOOC is also exempted from this.  Admin messages cannot be blocked.
 2016-05-05 10:14:34 -04:00
Datraen
efbe346c12 Removes circuit boards from relevant checks for microwaves, cooking. 2016-05-05 01:24:38 -04:00
Dibasic
626dc8a2f6 Change chemmaster custom preset to 15 and adds options for 30 and 60 units (#1548) 
* Change chemmaster custom preset to 60

60 is more commonly used for filling a whole bottle. The preset was 30 back when bottles only held 30.

* Adds options for moving 30 and 60 units

Also changes the default to 15 because 30 and 60 are now options.
 2016-05-04 23:23:59 -04:00
Yoshax
4d160c261d Revamps cargo supply code to allow for nicer code (#1508) 
* Adds lunchboxes to dinnerware vendor and buffs the amount of ingredients the chef starts with

* Revamps cargo supply code to allow for multiple items to be ordered on one line and nukes the remaining multiple lined orders

Corrects a number mistake

Fixes some list formatting

Actually fixes list formatting

* Removes a stray comma
 2016-05-04 17:20:22 -04:00
Yoshax
80caae01b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into roboticsandcells 2016-05-04 18:50:40 +01:00
Hubblenaut
9338f770f8 Ninja fixes and changes (#1547) 2016-05-04 13:45:25 -04:00
silveryferret
e518ce53e6 Manifestcheck (#1543) 
* Manifest Check

Adds a check for "Be Cultist" before summoning a manifest ghost
 2016-05-04 13:36:41 -04:00
Datraen
0937cce766 Merge pull request #1476 from redstryker/Winter-Coats-Loadout 
Adds All of the Winter Coats to the Loadout.
 2016-05-04 11:02:28 -04:00
Hubblenaut
8e52273e20 RCON Interface Update (#1545) 
* SMES interface charging fix

* Updates RCON console to use kW units
 2016-05-04 15:35:12 +01:00
Datraen
f2b1b56243 Renegade cap changed, autotraitor added to mixed traitor renegade. (#1529) 2016-05-04 15:27:37 +01:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Datraen
fbcf5bd530 Merge pull request #1542 from Dibasic/patch-6 
Fixes preferences typo
 2016-05-03 18:48:26 -04:00
Yoshax
023216389e Changes tinted windows in robotics to normal; Removes tweaked medical console; Replaces with normal medical records console; Changes access console access requirement to include robotics. 2016-05-03 23:11:14 +01:00
Yoshax
0a20abb6ec Updates a missed check and updates parentheses on uniforms/suits hiding shoes (#1540) 2016-05-03 22:19:25 +01:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517) 
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
 2016-05-03 22:18:12 +01:00
Dibasic
edfee3eb31 Fixes preferences typo 
fixes an extra space in the messages to toggle off ghost-ears and ambient noise.
 2016-05-03 14:40:57 -05:00