cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,037 Commits 10 Branches 0 Tags
878b195dbb39d0a5bbbb7029b55caa96e8d47af1
Commit Graph

596 Commits

Author SHA1 Message Date
PrismaticGynoid
5ffb0ee7e7 Replaces NT Relation with Economic Status 
Because starting money is pretty much all it affects, anyway. Instead of just being used to measure NT's opinion of you, you now choose income categories to fall under. This still affects how much money you start with, with the highest category giving a 1.3x modifier, but the lowest has been lowered to 0.5 times. Now you can start with even less money than before.

Currently doesn't change the "this person might be willing to help you" message for traitors, but it would be easy to do something different with that if requested.
 2018-01-07 14:12:10 -08:00
Leshana
65724afe58 Merge pull request #2687 from VOREStation/aro-sani 
Fixes a couple of charsetup sanitizes
 2018-01-05 14:22:07 -05:00
Arokha Sieyes
13b28ede55 Fixes a couple of charsetup sanitizes 
No more "YOU DIDN'T SET A SCALEEEEE" on new characters. Defaults to 100%.
 2018-01-05 12:28:15 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Leshana
4906d5ca83 Fix exploit allowing choosing unlimited languages on character setup. 
* Checks list length after input() returns so you can't cheese it.
* Sanitizes list to proper length so existing characters over the limit will be fixed.
 2018-01-04 20:52:35 -05:00
Atermonera
c9941e2450 S&R loadout spacing (#4486) 
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* S&R is inline w/ explorer roles in char setup
 2018-01-02 20:04:32 -05:00
Arokha Sieyes
e4d590f4e2 Add legwraps to loadout shoes list 
They're for digitigrade people who wanna look stylish!
 2017-12-27 14:49:32 -05:00
Cyantime
9e573e69fb Updates paths due to Polaris change 2017-12-25 22:31:01 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid 
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
 2017-12-12 19:51:35 -06:00
Anewbe
393144068e Merge pull request #4427 from MisterLayne/fear_of_needles 
Trypanohpobia
 2017-12-12 19:30:01 -06:00
MisterLayne
ccc88ed9d1 Fear the needle (in that person's hand, too). 2017-12-12 16:18:33 -05:00
Anewbe
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
Belsima
bb6d52d13d Adds blennophobia. (#4397) 
* Adds blennophobia.

* Adds blennophobia to character setup.

* fear updates
 2017-12-05 23:51:36 -06:00
mistyLuminescence
532cc711fa PsychHUD! 2017-12-04 00:05:10 +00:00
Cameron Lennox
4856786ceb Makes xenochimera able to select "Xenochimera" 2017-12-02 19:08:12 -05:00
Cameron Lennox
755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Belsima
2d3a306dea Loadout additions + fixes. (#4339) 
* Loadout additions + fixes.

* Selection fix.
 2017-11-27 19:21:49 -06:00
Verkister
dcdeba60ae adds gn set 2017-11-22 23:53:59 +02:00
Verkister
d699b23e9f Adds yet another new loadout accessory. 
-Drop straps. Basically dropped suspenders or drop pouches without the pouches.
-Basically I've been really digging the aesthetic thiccness of the drop pouches and just wanted the look available without the access walls and color restrictions.
-Yeah it's colorable too.
 2017-11-22 22:56:38 +02:00
mistyLuminescence
b1bfea36dc Friendships are no longer priceless 2017-11-18 17:55:35 +00:00
Verkister
bb2deea01d Fixes my lossed updoots. 2017-11-18 17:39:00 +02:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
mistyLuminescence
0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
Verkister
7c7794f74f Unrestricts my fluff goggles for general loadout use. 
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
 2017-11-16 09:31:27 +02:00
Neerti
0315b18185 Makes Icon Scaling Great 
Scaling wasn't great before so no Again.
Makes most icons not get blurry when scaled.
Makes all /atom/movable s able to be scaled with the adjust_scale() proc.
Adds ability for species to get scaled automatically.  Currently no species does this, but it is an option in the future.
Adds four traits to adjust your mob scale.  It is purely cosmetic at this time.
 2017-11-14 19:32:49 -05:00
Verkister
8c1fb156be Adds a cosmetic "armor vest" taur saddlebag subtype. 
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
 2017-11-14 16:18:47 +02:00
Spades
c37c291c10 Merge pull request #2455 from VOREStation/Cameron653-patch-1 
Loadout edits
 2017-11-12 11:55:17 -05:00
Verkister
09591d9395 It works now. 2017-11-11 16:00:37 +02:00
Cameron653
8714c006ff Update loadout_accessories.dm 2017-11-10 18:33:44 -05:00
Cameron653
d5e9f96493 Makes wallets (except for orange) free of cost 2017-11-10 18:29:44 -05:00
Cameron653
df89195c48 Makes tracking implant cost 0 
For preds
 2017-11-10 18:28:30 -05:00
Verkister
72edb34ecc Adds toggleable character pref for sharp/fuzzy scaling. 
-Yeah you should now be able to choose how you look.
-Especially benefitical for any character scaled to those atrociously fucked up deformation ranges.
-Can't really test it properly though due to the compile nature of the good ol' PIXEL_SCALE line in dm and my compy somehow forcing fuzzy on for some reason anyway. (my laptop's got the sharp mode tho)
-Kinda based on #1947 Go there for preview examples.
 2017-11-10 12:19:31 +02:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Belsima
28ab1e51f3 Removes some loadout items that have colorable versions. (#4173) 
* Removes the 5000 flats options.

* Removes the 5000 hair flower pin options.
 2017-11-01 22:19:20 -05:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561 
Plushie tweaks!
 2017-11-01 21:57:56 -05:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Anewbe
c68fb0861f Ports the background icons for char setup 2017-10-27 23:00:34 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
09ff4c1a3a Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout 2017-10-23 16:30:09 -05:00
Neerti
ca84cd326a Merge pull request #4139 from Anewbe/nicknames 
Adds the ability to choose nicknames
 2017-10-23 13:37:34 -04:00
Anewbe
28c9c12837 Adds the ability to choose nicknames 2017-10-22 00:56:46 -05:00
Cameron653
d1e939a50d Adds holo collar to loadout 2017-10-20 16:24:29 -04:00
Anewbe
79eb840538 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn 2017-10-19 09:57:26 -05:00
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094) 
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
 2017-10-19 09:36:15 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
5af9c1971d Merge pull request #4077 from Anewbe/rings 
Rings
 2017-10-16 19:04:36 -04:00
Anewbe
d886e52ac3 Merge pull request #4080 from shazbot194/Synth_color 
Synth Coloring
 2017-10-16 17:55:24 -05:00
Neerti
9ae54fb2ac Merge pull request #4083 from Anewbe/trait_fix 
Trait tweaks
 2017-10-16 18:51:01 -04:00