Commit Graph

551 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
TheDZD
0bedf9668b Merge pull request #5014 from Fox-McCloud/actual-fix
Actually Fixes Medical, Security, and Employment Records
2016-07-13 21:44:47 -04:00
monster860
717bdf79c0 ChemMaster fixes 2016-07-13 19:15:03 -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
TheDZD
62a1fc5a70 Merge pull request #4417 from tigercat2000/bay_equipping
Bay/Polaris loadouts
2016-07-02 19:26:21 -04:00
Fox McCloud
b0a1381c37 Merge pull request #4828 from Kyep/suggested_version
Adds warning when client BYOND version is old
2016-07-01 16:38:59 -04:00
Kyep
0da6dcfd9d Deletes a to_chat 2016-06-30 22:59:07 -07: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
Fox-McCloud
2df7ff16d8 Fixes Sound/Debug Preferences 2016-06-30 10:57:58 -04:00
Kyep
c60ee477e8 Adds warning when client BYOND version is old
Adds a chat text warning when a client connects to the server with a
version of BYOND which is at least one major version behind what is
current.
E.g we've declared the standard to be 510, and they connect with 509.

This warning does not actually stop them doing anything. It just tells
them to go update their BYOND.

This does not support minor versions (e.g: 510.1347) because the
client's "byond_version" var only reports the major version number.
Still, should help remind people who return to the game after an absence
to update their client before playing.
2016-06-29 23:49:30 -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
Kyep
d28cb5e8bc Allows admins to save their CC characters (#4717)
* Initial Checkin

- Creates two new admin-only jobs, "Nanotrasen Navy Officer", and
"Special Operations Officer". The former is for IC investigations by
admins of situations on the Cyberiad, and spawns in the admin room. The
latter is for leading/overwatching ERT teams, and spawns at the ERT
office.
- Neither of these jobs are accessible to normal players, either on
join, in preferences, or as a random job.
- When they are spawned, no announcement is made, and they do not show
up on the crew manifest.
- In other news, the "select equipment" debug verb has also been
adjusted so that NT Navy Officers get the same equipment either way.

* Fixes teleporter on admin station so that admins can use it to teleport directly to bridge

* Fixes CC jobs not always displaying CC HUD icon for sechuds

* Adds an implant that dusts someone on their death

* Tweaks

Changes:
- CC officers now spawn with an internals box in their backpacks, like
everyone else.
- CC officers now get dust and death alarm implanters in their backpacks
on spawn, rather than automatically having the implants in their bodies.
This enables admins to test things on admin station without worrying
about dusting or having their deaths broadcast.
- Dust implants no longer provide death alarm functionality.
- Dust implants no longer process().
- Dust implants are now based on explosive implants, and can be manually
activated via deathgasp.
- CC officers now spawn with CC headsets that are named 'centcom
headset'.

* Deletes CC encryption key

* Switches to using imp_in.dust()
2016-06-26 13:57:59 -04:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
monster860
e510106a85 Merge branch 'master' into vg-parallax 2016-06-23 19:19:32 -04:00
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
monster860
399a700285 Parallax Smoothing 2016-06-22 14:22:26 -04:00
monster860
be37311cb9 Fixes the opacity problem 2016-06-21 15:46:40 -04:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04: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
KasparoVy
3dba1b2886 Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)
* Ports #9294 and #9322 from VG: 'Yi' to Vox-pidgin and Framework for Icon-based Skin Tone (Feat. Vox) and Glasses/Goggles for Vox.

Both ported PRs by Intigracy.

Also adds all remaining in-use glasses/goggle sprites for Vox. I cleaned up the code a bit while I was in there. Otherwise, that's it.

Furthermore, randomizing skin tone doesn't seem to work for Vox despite their being specified in the conditional lists and s_tone being not null.

* Morph Support

* CMA Support

* Ports Intigracy's vgstation13/pull/9460, Noir Vision No Longer Greys Out HUD.

* Fixes Positioning of Vox Jensen Shades East+West facing Sprites.

Fixes Heist Goofery

Game-mode (not one-click antag) Heist tweaked and returned to working order now that I've found out how to test the actual game-mode (after temporarily adjusting the population requirement).

Vox Raiders won't spawn in with whatever socks were in their selected spawn-character's preferences anymore.

Additionally, the set_species proc now zeroes out skin tone if the species doesn't have skin tone to avoid goofing up the icons on initial generation.

Also condenses the code in preferences_setup character creation icon generation. Made it use the individual species' skin-tone handling procs instead of code snowflaked into preferences_setup.dm.

* No More Vox Tail Colours, but they can Colour Their Hair.

* Removes unneeded 'src's and retroactively prohibits colouring tails on species without HAS_SKIN_COLOR.

Colouration won't be applied to src's tail unless HAS_SKIN_COLOR is in
src's species bodyflags.

* Tidies up some Lists in CharPrefs and Retroactively Prohibits Vox Hair Colouration

* Reverts unnecessary commenting out of vox armalis post-spawn handling parent call.

* Adds Emerald and Azure Vox Skin Tones.

* Stealthy Wryn Typo Fixed.

* Greyscales Vox Head+Facial Hair and Adds More Default Colours in Species Definitions

* Gives Vox Raiders Default Hair Colour and Fixes Bug where Roundstart Raiders don't get Random Skin
2016-06-19 11:35:36 -04:00
Tigercat2000
37904ad4e1 Lower gear points to 5 per @necaladun's request 2016-06-15 21:07:56 -07:00