cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,325 Commits 8 Branches 0 Tags
d4a1c649c3fda7173f5f2a64f96839b6cdf51f99
Commit Graph

22632 Commits

Author SHA1 Message Date
Arokha Sieyes
d4a1c649c3 Merge pull request #27 from VOREStation/fake-nano-setup 
Fake NanoUI for Character Setup
 2016-05-08 14:46:29 -04:00
Cameron653
e611978f09 Fixes 
I'm tied to a chair being forced to code
 2016-05-08 14:34:59 -04:00
Cameron653
d694249ed7 Fixes sprites 2016-05-08 14:26:45 -04:00
Arokha Sieyes
286d6ba43e Remove errant imaginary </style> 2016-05-08 14:18:34 -04:00
Cameron653
01bcde7515 Makes dogborgs actually work 2016-05-08 14:15:13 -04:00
Cameron653
3130935f6b More editing 2016-05-08 12:47:01 -04:00
Cameron653
7f3ab0cbc4 Fixes a typo 2016-05-08 12:31:15 -04:00
Cameron653
28b6d34e96 Adds doghounds. WIP 2016-05-08 12:19:03 -04:00
Arokha Sieyes
9e215a1122 Character setup fake nanoui 
Makes them look nicer! Woo!
 2016-05-08 03:36:32 -04:00
Arokha Sieyes
da85dcca26 Basic vore prefs stuff 2016-05-08 01:10:09 -04:00
Arokha Sieyes
92befb200b Start of vore saving 
Also fixes a compile issue with removing the /vore interface type from
vore_vr.dm
 2016-05-08 00:27:27 -04:00
Arokha Sieyes
807bfc8888 Basic Vore Implementation for #1 (#25) 
* Basic Vore Implementation for #1

Adds vore sounds, bellies, vore procs, all types of vore except
macro/micro as that is not implemented yet. Also adds a few type2type
methods and a text method that we had before.

* Ending linebreaks

* More crlf

* Globalize two lists

* Removed interface type
 2016-05-07 23:51:53 -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
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -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
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
SinTwo
337e49fdc3 Fixes sleepers and advanced body scanners spitting out their parts. 2016-05-05 15:36:45 -04:00
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
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
Yoshax
f3cf85e9e6 Fixes a typo 2016-05-02 20:14:45 +01:00
Yoshax
af8dcac262 Remaps robotics and mechbay slightly, other adjusts and adjusts cell charger power usage to up charge rate 2016-05-02 19:16:06 +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