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
31,091 Commits 5 Branches 0 Tags
eae29b9d692fdea73b64a2040a3928d73be49f01
Commit Graph

68 Commits

Author SHA1 Message Date
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
Mark9013100
9aecdce655 Adds more ties to loadout, strangulation not included 2016-05-30 17:00:31 -04:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812) 
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
 2016-05-30 19:19:45 +01:00
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink 
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
 2016-05-29 16:22:07 -04:00
EmperorJon
5a545854a4 Underwear Datums (#1794) 
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
 2016-05-29 17:29:36 +01:00
Jon
ba529fabed Fixes #1790 2016-05-29 04:15:22 +01:00
Anewbe
1d3a57cd76 Pathing Tweaks (#1719) 
* Edits some pathing references

* Cleans up a spacing thing

* Map thing

* Adds the \improper tag to NT breacher gear, for improved grammar
 2016-05-28 17:17:41 +01:00
redstryker
420f2c8463 Adds Tracksuits 2016-05-27 15:19:07 -04:00
Yoshax
9ed1f2f495 Adds Cards Against The Galaxy to loadout 2016-05-27 00:48:08 +01:00
Arokha Sieyes
76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
 2016-05-26 09:59:18 -04:00
Yoshax
9b8aefed5b Adds towels 2016-05-25 18:38:16 +01:00
Yoshax
02fa5585c5 Fixes loadout skirts all spawning as black skirts 2016-05-23 19:35:13 +01:00
Yoshax
eaf0e1e4dd Fixes #175 2016-05-23 18:07:36 +01:00
Yoshax
0554eac2fc Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-23 16:14:28 +01:00
Yoshax
334a0238ae Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-22 14:22:47 +01: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
Datraen
2a6e86f4fc Merge pull request #1578 from SinTwo/clothes 
Skirt addition and loadout refactor
 2016-05-19 09:00:41 -04:00
SinTwo
3ed17ad1ec Back to /rank/ 2016-05-18 15:08:18 -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
Neerti
76058c701c Merge pull request #1629 from Datraen/SkrellGotHeadtail 
Adds more Skrell Headtail choices, loadout tweaks
 2016-05-13 00:32:01 -04:00
PsiOmegaDelta
a6dd6bfa4a Ports Bay's adjustments of the faux-nanoui character setup and related 2016-05-12 18:26:24 +01: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
redstryker
8ed4698b76 I'm an idiot. Fixed problem. 2016-05-11 16:16:31 -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
Hubblenaut
8d7446a3c4 Adds drop pouches as alternate webbings 2016-05-06 21:00:28 +02: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
EmperorJon
179f736829 Merge pull request #1500 from Yoshax/dresses 
Adds some dresses
 2016-04-29 13:19:29 +01:00
Yoshax
cf0a67d18f Restores ability to compile on 510 2016-04-29 01:34:20 +01:00
Datraen
46ac50494b Restocks departmental ponchos, reallocates blue ponchos. 2016-04-27 19:06:39 -04:00
Yoshax
c81679c0ee Adds some dresses 2016-04-27 23:14:58 +01:00
redstryker
d38049f338 Added /engineering to atmos coat path 2016-04-22 10:20:21 -04:00
redstryker
5c5fa5f853 Added /suit to paths 2016-04-22 10:15:14 -04:00
redstryker
61ab92c7f6 Adds all of the winter coats to the loadout. 2016-04-22 10:03:18 -04:00
Yoshax
0353ac2238 Makes cheongasm loadout selection clearer 2016-04-22 01:17:11 +01:00
Yoshax
c77a7d4c00 Makes cheongasms use fancy loadout tweak stuff 2016-04-21 22:29:30 +01:00
Yoshax
9e2119a873 Adds different colored cheongsams 2016-04-21 21:28:34 +01:00
PsiOmegaDelta
2e6f2c53a6 Loadout (vacuum-)flask contents now configurable. 
Can now prefill the loadout flask and vacuum-flask with a relevant liquid of your choice.
 2016-04-18 15:30:26 +01:00
Datraen
12c9156098 Fixes Teshari smocks, updates changelog. 2016-04-17 17:07:53 -04:00
Mark9013100
54955c4ea0 Adds the Warden & HoS navy blue and corp jumpsuits to loadout 2016-04-15 13:44:04 -04:00
redstryker
cc1d3e5c6d Adds Departmental Ponchos V2 (#1365) 
* Adds Departmental Ponchos

* Adds /roles to path in loadout

* Adds /roles to path for ponchos

* Added typesof(.../roles)

* Removes unneeded paranthesis

* Removes Armor Values

Removes armor values because fuck this shit, I just want this to get merged.
 2016-04-15 11:20:12 -04:00
Datraen
d40b34d4dc Adds jumpskirt to the jumpclothes list, renames selections for clothing. 2016-04-08 14:02:56 -04:00
Datraen
e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
PsiOmegaDelta
48b773fcfa Can now select the design and contents of your loadout lunchbox. 
Also allows gear tweaks to take up a whole row on their own, due to potential length.
Also fixes a couple of incorrect && logical operations. Should have been ||.
 2016-04-05 11:57:30 -04:00