cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 07:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

39 Commits

Author SHA1 Message Date
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax" 
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
 2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Mieszko Jędrzejczak
800669a2dd Dresses sandals, dress sandals, sandals. 2016-07-24 22:28:10 +02:00
Mieszko Jędrzejczak
dc8c0df65d Shines shoes, shines. 2016-07-24 22:18:07 +02:00
Mieszko Jędrzejczak
452ce45470 Adds things, things. 2016-07-23 22:20:40 +02:00
Isaac Erwin
8697578444 I need to go to bed 2016-07-23 06:34:24 -04:00
Isaac Erwin
31dc49cec7 Fixes the slash thing too, because Fox doesn't have any faith in me, among other reasons 2016-07-23 06:19:02 -04:00
Isaac Erwin
3fdee319e4 Fixes corporate security uniforms not being selectable 2016-07-23 06:03:59 -04:00
TheDZD
977aa93e44 Merge pull request #5089 from Fox-McCloud/clothing-restrictions 
Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change
 2016-07-21 10:09:36 -04:00
TheDZD
a58245e109 Merge pull request #5131 from Fox-McCloud/cleanup 
Cleans up Vars
 2016-07-21 09:16:03 -04:00
FalseIncarnate
f8699555db Fixes Engineering Coat and Hat not spawning for engineers 
It's "Station Engineer", not just "Engineer" for the allowed_roles.

🆑
bugfix: Engineers can properly show up for work with their hats and
coats to keep warm.
/🆑
 2016-07-21 02:50:59 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud
e039d4debe Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change 2016-07-18 00:30:50 -04:00
Mieszko Jędrzejczak
9cfb9c780d Removes errors, errors. 2016-07-16 10:54:41 +02:00
Fox McCloud
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts 
Did someone say "loadouts"?
 2016-07-15 11:25:34 -04:00
Fox-McCloud
d8895b0ce9 Actually Fixes Medical, Security, and Employment Records 2016-07-13 05:08:44 -04:00
Mieszko Jędrzejczak
52fbdd48b6 Adjusts. 2016-07-13 03:53:14 +02:00
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
Fox McCloud
276160ef8f Merge pull request #4928 from TullyBurnalot/Monocle! 
Prescription Monocles
 2016-07-09 18:31:16 -04:00
Mieszko Jędrzejczak
e1275c8a79 *sigh 2016-07-09 22:22:53 +02:00
Mieszko Jędrzejczak
037b149eda removes duplicate uniforms 2016-07-09 22:13:52 +02:00
Mieszko Jędrzejczak
30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
Mieszko Jędrzejczak
5745099842 birb. 2016-07-09 11:24:00 +02:00
monster860
94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -04:00
Mieszko Jędrzejczak
8344cb0e2a Adds pants, pants. 2016-07-08 19:42:57 +02:00
TullyBurnalot
9821a7f757 Prescription Monocles 
- Makes monocle prescription upgradable
- Adds monocles to Loadout options
 2016-07-08 03:59:25 +01:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Mieszko Jędrzejczak
932bbc7016 vox coat sprites, things 2016-07-07 17:42:20 +02:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
Krausus
b37cecbeae Fixes various runtimes (squashed) 
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
 2016-07-05 23:30:01 -04:00
Krausus
3b164cd8aa Loadout fixes and loadout points config option 
- Adds a configuration option for loadout points.
- Fixes the blue plaid skirt lacking its own unique type, causing
runtimes due to the mismatch between its display_name and
initial(display_name).
- Fixes the gear selection table using a fixed width.
- Fixes the restrictions column not consistently being added.
- Fixes the header and footer lacking the proper column span to account
for the restrictions column.
 2016-07-03 00:24:40 -04:00
Tigercat2000
567e1576f5 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences_toggles.dm
 2016-06-30 17:40:10 -07:00
Tigercat2000
82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
 2016-06-27 08:20:49 -07:00
Tigercat2000
5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences.dm
 2016-06-19 16:28:57 -07:00
Tigercat2000
37904ad4e1 Lower gear points to 5 per @necaladun's request 2016-06-15 21:07:56 -07:00
Tigercat2000
d927504dc1 Fix compile, Add job restriction column, make job skirts betterish 
Job skirts now only cost 3 points, any further job skirts selected will
not count towards points. Yes, you still spawn with multiple skirts if you
are in a position that has them, no, I can't fix it.
 2016-06-13 21:03:58 -07:00
Tigercat2000
d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
 2016-06-13 20:11:29 -07:00
Tigercat2000
07e5957645 TWEAK METADATA UNFINISHED 2016-05-15 20:03:29 -07:00
Tigercat2000
e91bd14fc6 Bay/Polaris loadouts 
Basics
 - Allows you to select up to 10 items in the character menu
 - Saved per-character
 - The items will be spawned when you join
 - Some items may have job limitations

Included Items
 - Accessories
   - Scarf
   - Black Scarf
   - Christmas Scarf
   - Dark Blue Scarf
   - Green Scarf
   - Light Blue Scarf
   - Orange Scarf
   - Purple Scarf
   - Red Scarf
   - Striped Blue Scarf
   - Striped Green Scarf
   - Striped Red Scarf
   - White Scarf
   - Yellow Scarf
   - Zebra Scarf
 - Cosmetics
   - Blue lipstick
   - Jade lipstick
   - Purple lipstick
   - Red lipstick
 - General
   - d20
 - Uniforms and Casual Dress
   - Blue Plaid Skirt
   - Purple Plaid Skirt
   - Red Plaid Skirt
   - Atmospherics Skirt
   - Black Skirt
   - Cargo Skirt
   - Chemist Skirt
   - CMO Skirt
   - Engineer Skirt
   - HOS Skirt
   - Medical Skirt
   - QM Skirt
   - Roboticist Skirt
   - Scientist Skirt
   - Security Skirt
   - Virologist Skirt
   - Warden Skirt
 2016-05-11 13:00:23 -07:00