cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,971 Commits 5 Branches 0 Tags
eb0efbf2ef6d741b038c316c39a7c642fa343721
Commit Graph

566 Commits

Author SHA1 Message Date
Jon
eb0efbf2ef Adds grey jeans, jeans shorts, and jeans shorts (female). Kinda annoyed we have so many variants but that's for another day. 
The grey jeans are the black jeans sprite (which are grey...)
The black jeans are now darker! But they still look different from black pants.
The black shorts have had their side-sprites darkened so they look black, not grey, and match the front/back view better.
The new grey variants keep those grey sides and have grey back and fronts too.
 2016-04-04 00:07:50 +01:00
EmperorJon
bdede3c3fd Merge pull request #1341 from Yoshax/lunchboxes 
Adds lunchboxes
 2016-04-03 20:25:19 +01:00
Yoshax
36c1746f37 Adjusts lunchbox loadout cost 2016-04-03 20:21:19 +01:00
Yoshax
a7e5116598 Adds lunchboxes 2016-04-03 17:12:01 +01:00
EmperorJon
a118265a4b Merge pull request #1340 from Datraen/PreferenceVerbsPerms 
Toggles now save preferences when toggled.
 2016-04-03 16:30:07 +01:00
Datraen
a2c4395bad Toggles now save preferences when toggled. 2016-04-03 09:15:01 -04:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb 
Adds the medical webbing
 2016-04-01 16:53:58 -04:00
Neerti
983192bf11 Merge pull request #1315 from Datraen/PrefVerbsPerms 
Updates Preference Permissions, Re-adds Verbs
 2016-04-01 16:53:52 -04:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Datraen
91a6c51ed2 Adds toggle verbs and procs. 2016-03-31 16:42:13 -04:00
PsiOmegaDelta
f7bd00521b Preference logic tweaks. 
Reduces copy-paste. Adds the ability to easily toggle settings.
No functional changes otherwise.
 2016-03-31 16:31:24 -04:00
Datraen
41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
PsiOmegaDelta
b277447426 Now possible to tweak colors of loadout items. 
Used to greatly cut down on the number of hats (hijabs, kippots, and turbans).
 2016-03-30 18:01:09 +01:00
PsiOmegaDelta
877e3d66df Makes loadout datums more flexible. 
Loadout item definitions can now also take a list of tweaks, which will adjust the item after spawn.
Currently includes color and icon state changes.
 2016-03-30 16:46:14 +01:00
EmperorJon
5e05d6b91a Merge pull request #1293 from Yoshax/progressbars 
Adds progress bars to tasks that take time
 2016-03-30 15:15:00 +01:00
Neerti
e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs 
Adds Navy Blue scrubs
 2016-03-30 02:24:07 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Yoshax
5b225ba765 Fixes subtype 2016-03-30 00:28:38 +01:00
PsiOmegaDelta
84799befca Can now toggle the progress bar visibility. 
Enabled  by default.
 2016-03-30 00:13:41 +01:00
Datraen
3809e92adf Merge pull request #1214 from Yoshax/morepreferences 
Makes it possible to have more than 16 preferences
 2016-03-29 14:44:47 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master 
Adds wallets to loadout menu
 2016-03-28 12:49:57 -04:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
PsiOmegaDelta
3d78390ce6 Adjusts preference defaults. 
They are no longer affected by whether clients are allowed to toggle them.
 2016-03-22 16:15:33 +00:00
PsiOmegaDelta
f3cde3af01 Both enabled and disabled preferences are now stored. 
The purpose is to ensure that new preferences that are in neither list get the appropriate enabled/disabled setting without having to utilize the savefile update path.

Also attempts to optimize the acquirement of the preference mob.
 2016-03-22 16:13:54 +00:00
Yoshax
78abc7f790 Fixes cherry picking errors 2016-03-22 16:07:58 +00:00
PsiOmegaDelta
ea579b2da6 Preferences now store client key instead of the client itself. 
For reasons unbeknown to me, the client var is reset when the client logs outs and thus the preference mob cease to be.
Now stores the client key, and acquires the appropriate mob based on that, if possible.
Also removes the sanitation check because the holder isn't set before the preferences are created.

Fixes #12341.
 2016-03-22 16:04:16 +00:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Kelenius
f41f52dea8 Removes topic limiter 2016-03-21 16:28:15 +03:00
Hubblenaut
5c1e5a89e6 Adds wallets to loadout menu 2016-03-18 13:07:38 +01:00
redstryker
1a0a517f47 Adds Security Skirts 2016-03-15 23:04:26 -04:00
EmperorJon
a730a61478 Merge pull request #1172 from redstryker/Turbans+Kippot 
Adds Turbans and Kippot and a Hoodie (V2)
 2016-03-12 19:31:15 +00:00
redstryker
5f7443c063 Adds Turbans and Kippot 2016-03-12 12:34:41 -05:00
Yoshax
ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Neerti
d7547ac702 Merge pull request #1095 from EmperorJon/27_Feb._AFK 
Adds a timer to staffwho AFK notifications.
 2016-02-28 07:13:56 -05:00
Jon
f20713e668 Adds a timer to staffwho AFK notifications. 2016-02-27 21:57:40 +00:00
redstryker
9873eddf7e Update loadout_head.dm 2016-02-26 16:21:04 -05:00
redstryker
df5e980843 Adds hijabs as a head item and a loadout item. 2016-02-26 16:17:56 -05:00
Datraen
1286bd8afa Makes the loadout screen use the display name instead of the item name. 2016-02-24 17:00:40 -05:00
Datraen
da3b0af760 Merge pull request #1035 from Yoshax/typofix 
Fixes #1034
 2016-02-21 11:31:45 -05:00
woodratt
7b1b4d081b 1.4.7 Bar Nerfs 
- Fixed wrong plating around the research break area.
- Navi beacons added to the central hallway, Beepsky sold separately.
- Newer smaller bar added, second spawn for bartender added. Button to lock the doors to and from the bar added to the security checkpoint.
- Garden Camera added for seeing the center of the park.
- Mule drop off point in medical added.
- Scrubbers and vents added to the CE's Office.
- Disposals on the research outpost linked to the outlet.
- Minor layout change in the warden's office.
- 2x more sunglasses added to maintenance.
- 2x more Welding goggles added to engineering, seriously I'm not adding anymore.
- Added a extra mop and bucket to the janitor's closet.
- Space heaters now available in hard storage for engineering.
- Fixed black tiles on Tcomms.
- All existing deck of cards on the main z-level should properly be a deck of cards and not null.
 2016-02-20 21:26:37 -08:00
Yoshax
dfb8547803 Fixes #1034 2016-02-20 22:16:03 +00:00
Yoshax
d8c9114d10 Fixes #1007 and adds other missing colored jumpsuits 2016-02-20 12:52:34 +00:00
Mark9013100
7d3b5a09b7 Adds the IA jacket/fake sunglasses to custom loadout 2016-02-10 14:16:50 -05:00
Zuhayr
517bf27034 Fixes a char setup runtime. 2016-02-10 15:15:23 +10:30
Zuhayr
84a045ffe5 Moved age min and max to the species datum. 2016-02-09 18:20:23 +10:30
Zuhayr
7453414faa Added new panel for loadout. 2016-02-09 00:09:39 +10:30
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30