Commit Graph

234 Commits

Author SHA1 Message Date
HugoLuman 5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask
# Conflicts:
#	icons/mob/human_face.dmi
2016-04-26 17:32:04 -07:00
TheDZD 8488c976e8 Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR
Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
2016-04-26 19:15:19 -04:00
TheDZD 18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
TheDZD f65910c3d9 Merge pull request #4274 from tigercat2000/attackpref
#4243 preference option
2016-04-25 18:34:48 -04:00
TheDZD cdc20258a1 Merge pull request #4212 from Tastyfish/bans
Cleans up special role jobbans
2016-04-25 18:34:37 -04:00
Tigercat2000 d08cb0db9c Adds a preference setting to the "ghost item attack" thing 2016-04-23 17:31:52 -07:00
Tigercat2000 0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
KasparoVy 6b73c047c5 Fixes Runtime
Occurred when trying to list hair, marking or facial hair styles in
situations where the head is the default Morpheus head (no replacement
head).
2016-04-21 22:23:09 -04:00
KasparoVy 698f81cefc Fix - Main Entries in Primary Choice Only
Ensures the first choice posed to the user is one of companies that only
offer one model and single entries for companies that offer more than
one model
2016-04-21 20:42:30 -04:00
KasparoVy 3b435c023a Refactor scissors, fix and finalize prefs, fix missing part definition for xion models, etc.
continued: Monitor changing verb will now only show a list of monitor
styles available for the monitor head brand you are using.

For example, if you chose any of the regular monitor heads (default
morpheus or anything suffixed with mtr.) you will get a list of IPC
standard monitor styles and nothing else.
However, if you chose the hesphiastos alt head (which is also a monitor,
but of a different style) the list will be populated with the monitor
styles suitable for that hesphiastos head, but none others (not even the
ipc standard ones, since those don't fit and hesphiastos alt. isn't in
the models_allowed list)
2016-04-21 19:59:09 -04:00
KasparoVy 6398e9c3fe Pass2 2016-04-21 19:58:38 -04:00
KasparoVy a9ee7ea97e PASS 1
TO DO: SCISSORS AND SHAVER REWORK
2016-04-21 19:58:37 -04:00
HugoLuman 18aaaa9366 Resolves conflict in interface/stylesheet.dm
The new stylecolor for Abductors used the same line as the Drask's

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-20 14:44:24 -07:00
Fox-McCloud fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Tastyfish 127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
HugoLuman 8cf7e5af84 Adds the rest of the karma code
(Hopefully)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 16:12:46 -07:00
HugoLuman 4d0792e020 Gives Drask skin tone and makes it choosable in the character menu
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-13 15:23:55 -07:00
HugoLuman 03323686d4 Drask files
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-12 19:00:29 -07:00
Fox-McCloud e1d057ab0e Fixes Blind Player Preference Doing Nothing 2016-04-12 03:21:39 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tigercat2000 0a44d41005 Change max character slots to 20 2016-03-28 08:57:42 -07:00
Fox McCloud 3a9588b1e6 Merge pull request #3960 from Crazylemon64/various_appearance_fixes
Appearance Refactor
2016-03-23 11:22:32 -04:00
Crazylemon64 c641ab73f2 Fixes DNA and copy_to appearance, and some round-start IPC hair runtimes 2016-03-23 04:44:05 -07:00
Crazylemon64 cf6a5555f4 Fixes DNA name and mitocholide limb rejuv 2016-03-23 02:31:28 -07:00
Crazylemon64 b9242cc960 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into various_appearance_fixes 2016-03-21 22:39:45 -07:00
Crazylemon64 dbbbbac7a4 Moves most appearance code into "copy_to", rather than new_player 2016-03-21 22:26:41 -07:00
TheDZD 1212c9dde5 Merge pull request #3943 from KasparoVy/ipc-fbp-emergency-fix
ASAP Fix, Character Configuration - Prosthetic Typo
2016-03-20 19:14:28 -04:00
KasparoVy 5ffc070a4f FIX 2016-03-20 19:01:52 -04:00
TheDZD 854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved
IPC-FBP Customization
2016-03-20 18:43:51 -04:00
KasparoVy 760f956cf7 Drops some excess brackets. 2016-03-19 04:27:12 -04:00
Crazylemon64 d748ef23b8 Makes DNA swapping methods more reliable
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
2016-03-17 23:07:45 -07:00
KasparoVy 98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
Fox McCloud ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Crazylemon64 7e510dfdb6 Changing a person's appearance now works better
Also fixes some problems on changing gender
2016-02-29 19:31:29 -08:00
Aurorablade 5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade 95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Tigercat2000 48349a3d9e Nano Obssession: Chromeless window, Styles
Does the following:
 - Adds 'chromeless' mode (NanoUI defaults to using this)
  - Window borders disappear, replaced by in-browser elements for
    minimize/close/move/resize.
  - You *must* move/resize slowly when using this mode, or it can have
    unexpected results, as the JavaScript cannot keep up as well as the
    native windows movement.
 - StatusGroups are now transparent: This looks nice. That's about it.
 - Body background switched to a .svg format for the NanoUI Logo.

 - Coder things:
  - Nano's JavaScript now has a new class, NanoWindow
   - NanoWindow handles all of the chromeless work. It'll be used to
     replace portions of NanoStateManager later.
2016-01-18 09:54:40 -08:00
Aurorablade 51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Crazylemon64 de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
Fox-McCloud 9478fc078c Fixes a Few Vulp Typo's 2016-01-05 19:39:19 -05:00
Aurorablade 948adea83b Added Asses as an organ
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Aurorablade a4c420ccde Conflict fixing time 2016-01-01 22:32:13 -05:00
KasparoVy eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00
KasparoVy 5d816d943d Cleans up the tiniest bit. 2015-12-28 20:57:07 -05:00
KasparoVy f0c4a0623c Final Accommodation of #3025
Copypastas #3025's version of code\modules\client\preferences.dm and
re-applies all the changes I made to the pre-#3025 version of that file
in order to accommodate the PR.
2015-12-28 20:43:58 -05:00
Crazylemon64 c4cb53bf0a To heck with it here we go looks good enough
Also
- Increases the number of memes in the codebase
2015-12-28 01:12:13 -08:00
KasparoVy 366d05f745 Generalization + Features for Other Species
Turns horns into head accessories, fixes some species checks, gets
Tajara and Vulpkanin into the mix, ensures the system cannot be
exploited, adds species-specific body markings for Tajara, Vulpkanin and
Unathi.
2015-12-28 01:02:23 -05:00
KasparoVy abb528366e Guts Tails (for now), adds Horn Colour Customization, Fixes Icon Typo, Cuts Old File, Adds Species Checks
Cuts tail markings to be implemented in another PR, adds the ability to
change the horn colour independent of the body colour and reworks the
code accordingly, drops the preferences_savefile.dm as it's unused
(@crazylemon64), adds some species checks just for uniformity
2015-12-27 19:43:12 -05:00
Crazylemon64 6f631b94c3 Reduces the amount of memes in the codebase 2015-12-27 14:46:11 -08:00