Commit Graph

707 Commits

Author SHA1 Message Date
Crazy Lemon
4e9236090e Merge pull request #6776 from FlattestGuitar/shoes
Ports tg's winter boots 👞
2017-03-16 17:46:27 -07:00
Markolie
31e10b1b07 Flavor text fix, disabilities window popup 2017-03-16 23:51:46 +01:00
Markolie
e2a30cc7fe Preference, changeling and record fixes 2017-03-16 23:39:26 +01:00
FlattestGuitar
603668fb23 Adds winter boots; adds workboots to the loadout system 2017-03-15 19:45:40 +01:00
Fox McCloud
d6da6e3f52 Merge pull request #6527 from davipatury/modular_computers
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
Krausus
a803500489 Fixes admin bwoink preference
Non-admin players no longer get the (unusable) verb to toggle it, nor is
its setting respected when PMing them
2017-03-10 19:46:35 -05:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
davipatury
781e66ec52 Fix conflicts. 2017-03-08 12:57:45 -03:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
2017-03-07 22:25:11 -05:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
davipatury
af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
FlattestGuitar
14bc738ca3 Adds confirmation thingies to karma purchases 2017-03-02 20:36:49 +01:00
Crazylemon64
6ec6c90aad Allows IPCs to express themselves as a gender again 2017-02-26 12:06:16 -08:00
Crazylemon64
26bfc2c1b7 Removes IPC gender 2017-02-25 22:49:36 -08:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
davipatury
bfc130dafb Base. 2017-02-19 21:54:46 -03:00
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Tigercat2000
e7023fd032 Refactored 'select equipment' to use outfit datums
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
Tigercat2000
14ba6fded6 Ported /tg/'s outfit datums, refactored job controller to support them
Players:
 - The only thing that you should notice is that your backpack options
 have changed. Instead of being "None", "Backpack", "Satchel", and
 "Satchel Alt", there are 6 options:
   - "Grey Backpack": Ensures you always recieve a plain grey backpack.
   - "Grey Satchel": Same as the above, grey, plain, satchel.
   - "Grey Dufflebag": So you don't have to rush the locker room, I
   guess. Just kinda ransacked it from /tg/. Happy to revert it, please
   do not post a five paragraph text wall calling me a shitlord
   powergaming hitler-loving furry.
   - "Leather Satchel": It's a leather satchel. What the hell did you
   think it was?
   - "Department Backpack": Gives you the department's default backpack.
   Grey for most jobs.
   - "Department Satchel": It gives you the department's default
   satchel; A grey satchel if the department doesn't have one.

Coders:
 - The above means this needs a minor SQL change:
   ```
   SQL goes here
   I'll write a query later
   Can't be bothered now
   Kill me please
   ```

 - This is a cleaner method of handling job equipment than
 "M.equip_or_collect" x 1000. Jobs specify a '/datum/outfit' datum,
 which defines all of the things to equip to the user.

 - Minor note: equip_or_collect will no longer ever generate a plastic
 bag. It will instead just drop stuff on the floor if it can't stuff it
 into a mob. If this is even slightly a point of contention, more than
 happy to revert it; It was just requested by Fox.
   - Addendum: This also has the effect of making it so that labcoats
   are just thrown onto the floor if you have a loadout suit. It's not
   really avoidable. Uniforms and suits are equipped before the
   backpack.

 - Changes from /tg/:
   - Changed all of the "H.equip_to_slot_or_del" calls into invoking a
   new "equip_item" proc; This is used to support a new variable called
   "collect_not_del". Job outfits use this, it makes it so that the
   system calls equip_or_collect instead of equip_to_slot_or_del. The
   idea being that job items should never be lost to the void,
   especially because they can conflict with loadout items.

TODO:
 - Retrofit "Equip Mob" verb to use this for all of the non-job options
 - Fully implement head announcements(?)
   - May be best for a second PR that addresses all of the real issues
   with our current job system

( Now go reread that SQL code block :) )
2017-02-17 11:35:45 -08:00
Crazy Lemon
96afaca62c Merge pull request #6293 from KasparoVy/deadchat-anon-pref
Makes Deadchat Anonymity Persistent as a Preference
2017-02-14 20:54:27 -08:00
Crazy Lemon
1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools
Goonchat Admin Filters
2017-02-14 13:09:24 -08:00
KasparoVy
46158e7854 conflict resolution 2017-02-13 06:35:17 -05:00
Fox McCloud
300751373d Merge pull request #6280 from fludd12/Grey-Wingdings
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Fox McCloud
5953b527c0 Merge pull request #6398 from tigercat2000/game_pref_fix
Fix window flashing not saving to SQL & Add error logging to log_client_to_db
2017-02-13 06:18:20 -05:00
Markolie
f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
Crazylemon64
6718d49af9 Fixes client varedit 2017-02-11 13:40:45 -08:00
Tigercat2000
f427d4315f Fix window flashing not saving to SQL & Add error logging to
log_client_to_db
2017-02-11 07:15:04 -08:00
Fox McCloud
04f5276047 Merge pull request #6350 from Markolie/lavaland_updates
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
Crazy Lemon
17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
2017-02-10 18:27:58 -08:00
Markolie
0117892f54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/game/machinery/doors/firedoor.dm
2017-02-10 18:18:29 +01:00
Markolie
2afd77a54a Split admin interaction into regular and advanced, make more devices ghost-interactable 2017-02-09 19:30:36 +01:00
Markolie
44a55cd88e Clarify variable description 2017-02-09 01:22:16 +01:00
Markolie
77e54da0f6 Enable observing interacting by default 2017-02-09 01:21:02 +01:00
Markolie
4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00
KasparoVy
e281459d8a Fixes Windowflashing Pref not Saving, Changes Query Order to Reflect Schema 2017-02-06 19:23:11 -05:00
Tigercat2000
c0d3855d53 Goonchat Admin Filters
This adds Message filters to Goonchat (only for mentors +
administrators).

There is a new option in the settings dropdown of Goonchat to access
these. They are temporary, non-destructive filters which will hide all
messages matching them that are already in your chat, as well as any new
messages matching them.

There are 5 filters currently:
 - Admin; Filters out most admin logs.
 - Combat; Filters out a limited subset of combat messages-
 Specifically, any message with the 'combat' span class. Currently, this
 has only been added to the central /attack and /attacked_by procs, so a
 large considerable amount of hostile actions taken against a
 player are still not going to be filtered out. We can work on adding
 the identifier to more stuff later.
 - Radios: Filters out all radio messages.
 - Speech: Filters out all mob speech.
 - OOC: Filters out OOC chat.

There is also an "All" option, which just turns off all messages that
are not internal to Goonchat.
2017-02-06 12:19:33 -08:00
Markolie
1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Markolie
8e4439c7f1 Add immortality talisman, add final items 2017-02-06 20:08:52 +01:00
KasparoVy
ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
fludd12
18b806df86 Don't blame me this was Krausus' idea 2017-02-03 22:36:06 -05:00
fludd12
fe9f547da6 Moves spans to mind 2017-02-03 22:05:16 -05:00
KasparoVy
32c4ba083d IPC Names now Load Correctly from SQL
If you want to have a name like ARMA-420 in game you previously had to
manually set it every round because it wouldn't load properly from SQL
because reject_bad_name doesn't like no numbers.

Changes that.
2017-02-02 20:33:32 -05:00
KasparoVy
9d30930338 Makes Ghost Anonsay Persistent by Turning it into its own Preference
By turning it into its own preference. The verb stays in the ghost tab, except it now operates by checking client preferences.

Needs
ALTER TABLE `player` ADD `ghost_anonsay` TINYINT(1) NOT NULL DEFAULT '0' AFTER `lastchangelog`;
to add it to the SQL
2017-02-01 02:17:28 -05:00
Fox McCloud
0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash
Window Flashing
2017-01-31 01:30:39 -05:00
fludd12
2d784b3b59 Fixes the weird files finally 2017-01-30 21:40:34 -05:00
KasparoVy
d73413b046 Uses the Disabilities system more correctly
Allows eyes to track eye-dependent disabilities when removed from the mob.
Farwas and Wolpins are now incurably colourblind (non-genetics based), so going lesser-form and back won't wipe your colourblindness.

Eyes being straight-up deleted (as per how set_species() handles setting up the organs required for the species we're changing to) no longer wipes colourblindness.

Now with more helper procs, less unnecessary commenting, random changes and other cleanliness-related tweaks.
2017-01-26 04:10:55 -05:00
KasparoVy
c16f734a6d Changes Colourblindness from a Preference to a Disability
For Vulpkanin and Tajara, it gives them their species-specific
colourblindness but their excellent darksight, too. Otherwise it gives
noir vision.

You can choose this disability at character creation. It is off by
default. You can turn it off via genetics and mutadone.

Fixes Cling Transform&Lesser/Greater form & Darksight bugs

Transforming to an identity will now, with 100% reliability, give you
the exact appearance as that ability bar the body_accessory and the
secondary hair/facial hair colours. Same thing with going from lesser
form to an identity that was not the one you lesser formed with.

Fixes the darksight bug from the last commit, happened 'cause typo.
Woops.

Eye Transplantation Applies Eye-dependent Genes

Transplanting colourblind Vulpkanin/Tajara eyes into a Human gives the Human
the dark_view and unique colourblindness of said Vulpkanin eyes.

Removing colourblind eyes will take the disability with it, meaning the
person will have colour vision/low darksight.
2017-01-25 23:10:22 -05:00
KasparoVy
28f9496713 Adds Colourblindness for Vulpkanin&Tajara, Refactors Darksight, tidying up, etc.
Adds colourblindness for Vulpkanin and Tajara that can be turned on by a
preference in character creation. By default, Vulpkanin and Tajara still
see in full colour, however their darksight is reduced to Human levels
unless they choose the 'unaugmented' eyes option.

Refactors darksight so it's tied to the eye organ. Refactors noir
glasses.

You can now visually distinguish mechanical/mechassisted organs from
their organic counterparts due to their names and icons.

Resolves issue w/ Colour-vision after Cloning/Lesser-to-greater Formswapping.

Cloned Vulpkanin and Tajara get unaugmented vision (colourblind and
darksight) by default since the cloners can't administer the
eye-augmentation surgery. Same goes for swapping from lesser to greater
form as a Changeling.

The monkey-forms of Vulpkanin and Tajara now have almost the same organs as
their greater forms, meaning they get the same colourblindness but
excellent darksight.
2017-01-25 23:06:30 -05:00
KasparoVy
5b9a5aeb6e Reduced redundancy.
Setting .disabilities and .mutations was made redundany by the use of
SetSEState and domutcheck.
2017-01-18 19:39:49 -05:00
KasparoVy
4a420ef768 Fat characters are now fat. 2017-01-18 18:44:36 -05:00