cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,377 Commits 5 Branches 0 Tags
3d9435c9b3d7c79474c30ea047c38b1df293a38c
Commit Graph

13895 Commits

Author SHA1 Message Date
Datraen
3d9435c9b3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
 2016-05-12 17:24:55 -04:00
PsiOmegaDelta
a6dd6bfa4a Ports Bay's adjustments of the faux-nanoui character setup and related 2016-05-12 18:26:24 +01:00
Neerti
cb5d2db7b9 Merge pull request #1621 from Datraen/FakeNanoUI-More 
Brings New Player Manifest, Load Slot into FakeNanoUI.
 2016-05-12 00:39:44 -04:00
Datraen
16366b8e3d Brings New Player Manifest, Load Slot into FakeNanoUI. 2016-05-12 00:14:23 -04:00
Neerti
e2862ff083 Merge pull request #1616 from Anewbe/ai_languages 
AI Language tweaks
 2016-05-11 22:40:18 -04:00
Datraen
761ea91a70 Changes the colors of the occupation setup tab. 2016-05-11 21:14:33 -04:00
Anewbe
ea8d63e9fd Adds Siik'Maas and Schechi to AI language list 2016-05-11 18:06:57 -05:00
Datraen
4456f77d75 Merge pull request #1551 from Zuhayr/master 
Makes slime people more interesting and thematic.
 2016-05-11 02:34:50 -04:00
Datraen
5afebdbf27 Merge pull request #1603 from Anewbe/borg_languages 
Fixes borg languages
 2016-05-11 02:27:58 -04:00
Datraen
b6a4d7ff4c Adds slimebaton, xeno taser. 
Slime attack text changed.
 2016-05-11 02:18:46 -04:00
Neerti
021fc36f9f Merge pull request #1587 from Anewbe/borg_armor_boost 
Borg Armor Tweak
 2016-05-11 01:58:42 -04:00
Neerti
84d389a0c7 Merge pull request #1479 from Yoshax/limbfixes 
Wound Changes + Fixes + Medical Changes
 2016-05-11 01:53:58 -04:00
Datraen
e7b563ee01 Merge pull request #1593 from VOREStation/fakenano-setup 
New Player/Character Setup (Fake)NanoUI
 2016-05-11 01:53:04 -04:00
Neerti
b65ed00b5f Merge pull request #1415 from Hubblenaut/reinf 
Reinforced Walls
 2016-05-11 01:52:46 -04:00
Datraen
3fb4620199 Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns 
Buffs Back Pulse Rifles
 2016-05-11 01:51:13 -04:00
Anewbe
4b1e5c1de5 Fixes borg languages 2016-05-08 22:58:21 -05:00
Arokha Sieyes
4f7aba8b27 Panel closes on latejoin 
Sure would be nice if that panel went away when you latejoin.
 2016-05-08 17:06:53 -04:00
Arokha Sieyes
5692ad76ad Removed imaginary </style> tag from previous work 2016-05-08 14:20:18 -04:00
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
e2293f1e79 Gives drinking glasses a material so they have a cost in autolathe 2016-05-08 15:51:16 +01: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
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
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04: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
Hubblenaut
8d7446a3c4 Adds drop pouches as alternate webbings 2016-05-06 21:00:28 +02:00
Yoshax
5b747a98dc Fixes incorrect checks 2016-05-06 01:27:21 +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
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
Hubblenaut
9338f770f8 Ninja fixes and changes (#1547) 2016-05-04 13:45:25 -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
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
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
Datraen
ff06850ea1 Merge pull request #1538 from Yoshax/dress 
Allows for uniforms to hide shoes with HIDESHOES
 2016-05-02 21:59:04 -04:00
Yoshax
053851f28b Allows for uniforms to hide shoes which HIDESHOES 2016-05-03 02:10:54 +01:00
EmperorJon
f62eacf6e5 Merge pull request #1519 from Yoshax/smokegrenades 
Smoke grenade changes and adjustment
 2016-05-02 18:04:23 +01:00
EmperorJon
5996239657 Merge pull request #1530 from Datraen/NullSpeakCheck 
Adds a check for can_speak to prevent null language procs being called.
 2016-05-02 18:00:15 +01:00
Datraen
6dce14fd17 Merge pull request #1535 from Neerti/5/2/2016_runtime_fixes 
Fixes two very common runtimes
 2016-05-02 01:01:20 -04:00