cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,349 Commits 8 Branches 0 Tags
5f8ce48793a3e8220224f60b98b51df7bb9b10c0
Commit Graph

836 Commits

Author SHA1 Message Date
Arokha Sieyes
10030a30fd Fixes #132 
As message.
 2016-05-21 12:31:37 -04:00
Cameron653
f750a94b05 Adds nudity permit 2016-05-21 00:25:36 -04:00
Cameron653
027dae5369 Ports wedding rings from Citadel 2016-05-20 21:39:50 -04:00
Leshana
ff63ec73da Ported collars from VirgoStation 
* Six types of regular collar and one holocollar
* Collars attach to clothing or can be worn in exosuit slot by nude people.
* Holocollar can have its tag description set.
 2016-05-20 19:33:39 -04:00
Arokha Sieyes
8230732453 Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync 2016-05-19 23:52:00 -04:00
Datraen
ec3e4a0315 Merge pull request #1698 from VOREStation/bored,_fix_polaris 
Fixes two high-priority issues
 2016-05-19 14:29:46 -04:00
Arokha Sieyes
5e59efd8dc Fixes #802 
OR not AND
 2016-05-19 12:09:50 -04:00
Datraen
2a6e86f4fc Merge pull request #1578 from SinTwo/clothes 
Skirt addition and loadout refactor
 2016-05-19 09:00:41 -04:00
Yoshax
96b7772f55 Revert "Disables alternative title validation to allow for admins to give people/themselves retainable non-standard titles" 2016-05-18 22:43:08 +01:00
SinTwo
3ed17ad1ec Back to /rank/ 2016-05-18 15:08:18 -04:00
Arokha Sieyes
7914c9d943 Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-18 10:13:26 -04:00
Yoshax
c53f214b7b Disables alternative title validation to allow for admins to give people/themselves retainable non-standard titles 2016-05-17 16:48:12 +01:00
silveryferret
82f09c1642 Replaces BE_MONKEY with BE_RENEGADE 
As title. Also adds Renegade into the antagonism tab underneath
character set up.
 2016-05-16 21:20:30 -05:00
Arokha Sieyes
d7e65b22ba Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-16 18:31:38 -04:00
PsiOmegaDelta
6ce5eef293 Can now see how many points have been spent in each loadout category. 
Also adds a small hack to fix #12560. Validation no longer occurs if the preference mob doesn't exist.
 2016-05-16 17:23:08 +01:00
Neerti
79b91df133 Merge pull request #1615 from redstryker/Varsity-Jackets 
Adds Varsity Jackets V2 (Because I'm an Idiot)
 2016-05-15 18:24:57 -04:00
Arokha Sieyes
f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update 
# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.
 2016-05-15 12:39:30 -04:00
Arokha Sieyes
88dd4973c8 Hid latejoin_only jobs from occupations screen 2016-05-14 20:15:27 -04:00
Arokha Sieyes
231ee5bf35 Work on satisfying travis 2016-05-14 13:38:24 -04:00
Leshana
53a58d7c43 Working on Issue #11 - Added custom race option 
* Added to character setup screen.
* Added to examine text.
 2016-05-13 20:07:39 -04:00
Neerti
76058c701c Merge pull request #1629 from Datraen/SkrellGotHeadtail 
Adds more Skrell Headtail choices, loadout tweaks
 2016-05-13 00:32:01 -04:00
Leshana
80a95b0cf5 Adds micro/macro and weight gain options to the character setup screen. 
Moves the location of saved micro/macro variables to the main /datum/preferences for ease of use.
 2016-05-12 21:38:41 -04:00
Yoshax
75b1f53141 Comments out ignore and unignoring in character setup, properly removes ability to ignore yourself 2016-05-13 01:16:44 +01:00
Yoshax
3e184d7982 Removes ability to ignore yourself 2016-05-13 01:04:56 +01:00
PsiOmegaDelta
a6dd6bfa4a Ports Bay's adjustments of the faux-nanoui character setup and related 2016-05-12 18:26:24 +01:00
Arokha Sieyes
17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix 
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
 2016-05-12 13:02:51 -04:00
Datraen
3103b16489 Adds colorable headtail. 
This required ear slots to inherit color for mob sprites, and this was also given to glasses.
 2016-05-12 12:41:26 -04:00
Datraen
2f03df4b9b Adds Headtail Chains, Bands, Cloth by Wer6. 2016-05-12 11:45:43 -04:00
Arokha Sieyes
272e0dda3d Merge pull request #45 from VOREStation/tailsnears-4 
Issue #4 - Implement custom tails, ears, and taurs.
 2016-05-11 23:40:27 -04:00
Leshana
88e46b624a Issue #4 - Implement custom tails, ears, and taurs. 
- Added datums and icons for custom ears.
- Added datums and icons for custom tails.
- Added datums and icons for taurs, now a subtype of tails.
- Integrated into icon_updates() for in game appearance.
- Integrated into preferences_setup() for character setup preview.
- Added ears and tails to the character setup screen.
- Enabled nagataur support for micro/macro step-over messages.
 2016-05-11 23:25:17 -04:00
Datraen
d7ea30c158 Changes the colors of the occupation setup tab. 2016-05-11 21:23:40 -04:00
Datraen
761ea91a70 Changes the colors of the occupation setup tab. 2016-05-11 21:14:33 -04:00
redstryker
8ed4698b76 I'm an idiot. Fixed problem. 2016-05-11 16:16:31 -04: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
Arokha Sieyes
5692ad76ad Removed imaginary </style> tag from previous work 2016-05-08 14:20:18 -04:00
Arokha Sieyes
286d6ba43e Remove errant imaginary </style> 2016-05-08 14:18:34 -04:00
Arokha Sieyes
9e215a1122 Character setup fake nanoui 
Makes them look nicer! Woo!
 2016-05-08 03:36:32 -04: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
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
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
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -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
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