Commit Graph

6666 Commits

Author SHA1 Message Date
FalseIncarnate
daf777979f Minor Bug / Exploit Fixes
Fixes #4786
- Chicks that age up to chicken will retain their ghost (if any) into
their adult stage.

Fixes #4836
- Intercoms now properly check their buildstage when removing cables and
electronics to avoid being used to infinitely generate these objects
- Fire alarms and air alarms now also have this exploit-protection. APCs
already had a form of this protection.
2016-07-02 23:32:18 -04:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance
TG Armor Rebalance
2016-07-02 19:26:41 -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
f1bb017d59 Merge pull request #4844 from Krausus/JustWaitASecond
Adds Short Delay to Late-Join Job Selection
2016-07-02 19:15:28 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
TheDZD
506f6885a8 Merge pull request #4834 from Fox-McCloud/emote-revert
Reverts Emote System
2016-07-01 20:36:40 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Krausus
3f4e15e35a Adds 1-second delay to late-join job selection 2016-07-01 17:22:26 -04:00
Krausus
03fa9c1818 Adds KEEP_TOGETHER to ghost images (#4839) 2016-07-01 12:59:07 -04:00
monster860
64b54498ff Fix #4793 (#4794)
* Fix #4793

* makes it actually work

* Fixes stuff, now it should look identical to the original

* Theere, now it's PERFECT.
2016-07-01 12:03:19 -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
Krausus
6a8ea1db53 Categorizes Late-Join Job List (#4826)
* Late-Join Job List Categorization

* Late-Join Job List Columnization
2016-06-30 20:19:28 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
TheDZD
3a262b7a67 Merge pull request #4777 from Kyep/mindshield
Renames Loyalty implants to Mindshield implants
2016-06-30 12:03:03 -04:00
TheDZD
784b299fe2 Merge pull request #4822 from Fox-McCloud/laughter-demon
Ports TG's Laughter Demon
2016-06-30 11:25:58 -04:00
TheDZD
cdcd4a64de Merge pull request #4824 from Fox-McCloud/lobby-fix
Lobby Players Ready Fix
2016-06-29 22:15:42 -04:00
Fox-McCloud
cf63c2f47e Lobby Players Ready Fix 2016-06-29 13:21:44 -04:00
tigercat2000
282e8088b2 Runtime & Goonchat fixes (#4820)
* Fix goonchat banned-cookie misdetection

* Runtime fixes

* Fix #4813

* Fix #4818

* Whoops.

* Actual emote runtime fix
2016-06-29 11:12:16 -04:00
Fox-McCloud
d61583dd1f better handling 2016-06-29 11:08:51 -04:00
Tastyfish
cc1f984136 Fixes a bunch of to_chat runtimes (#4817)
* Fixes a bunch of to_chat runtimes

* also that one
2016-06-29 08:31:27 -04:00
Kyep
3183192c27 Tigercat, Tigercat, does whatever a Tigercat does 2016-06-27 22:05:37 -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
TheDZD
7ca80b2581 Merge pull request #4791 from VampyrBytes/Poly_fixes
Poly grabs the colour macro!
2016-06-26 16:43:15 -04:00
VampyrBytes
108d6aaa40 Poly grabs the colour macro! 2016-06-26 21:32:14 +01:00
TheDZD
f29501704f Merge pull request #4779 from Fox-McCloud/pai-tweak
pAI Candidates can now see who requested them
2016-06-26 15:00:50 -04:00
LittleBigKid2000
83b66cf35b Space explorer corgis are now space worthy (#4771)
* Space explorer corgis are now space worthy

Now space explorer corgis can explore space. Don't question how a corgi
is able to breathe without an airtank. The answer is bluespace.

🆑
rscadd: Space explorer corgis can now safely explore space
/🆑

* The space-proofness should now be reset when the hardsuit is taken off

* This is probably wrong, but it works

* I have no idea what this does, but Fox said to do it
2016-06-26 14:01:01 -04: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
Kyep
7a8480b1a5 more text changes 2016-06-25 18:59:10 -07:00
Fox-McCloud
e3a5f32586 pAI Candidates can now see who requested them 2016-06-25 09:28:50 -04:00
Kyep
55d0472268 Initial checkin 2016-06-25 00:35:00 -07: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
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
Tastyfish
0b25a0ed02 Fixes snpc PDA bug, heavily reduces rate that snpc chef does their thing (#4742) 2016-06-23 04:20:02 -04:00
Krausus
22a3bcf704 Emote Fixes and "Me" Tweak (#4749)
- Tweaked "Me" verb to allow inclusion of the message when typing
directly into chat box.

- Fixed ghosts, with ghostsight on, seeing emotes twice when near the
emoter.

- Fixed *flip runtiming when used with no target and no grab.

- Fixed scream not displaying any message.

- Fixed double sanitizing in custom emotes.

- Fixed several cases where user wasn't getting passed into proc calls.

- Removed a couple unnecessary periods from dialogs.
2016-06-22 14:24:22 -04:00
VampyrBytes
8af56d111c Makes jump actually jump (#4735)
* Makes jump actually jump

fixes #4707
sets flying to 1 for the duration of the jump. Means you can jump over
anything you can fly over.

Also fixes a bug with flying that could leave you visually floating
(pixel_y = 5) when you stop flying

* better fix
2016-06-21 16:56:11 -04:00
Twinmold93
475197ee1e Fixes Resisting Borers (#4729)
This changes the captive brain's resist connection back to resist() from
resist_borer() (an invalid verb). Makes it so you can once again resist
borers.

Reposted due to number of files adjusted from merging of conflicting
files and inconsistencies to prevent breaking other code.

🆑 Twinmold
Fix: You can once again resist borer control with the Resist verb.
/🆑
2016-06-20 03:51:47 -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
TheDZD
12314b64e7 Merge pull request #4349 from VampyrBytes/DatumEmotesMK2
Datum Emotes MK II
2016-06-19 14:04:00 -04:00
TheDZD
36aaa78b76 Merge pull request #4610 from monster860/ui_plane
Puts UI on it's own plane
2016-06-19 13:38:01 -04:00
FalseIncarnate
ae70a7fc69 Bug Fixes (#4714)
* Bug Fixes

Fixes #4616
- All ladders are now anchored and cannot be dragged, including dive
points.

Fixes #4663
- Trying to fill a full container from a toilet will inform you the
container is full, and thus fail.

Fixes #4705
- Being gibbed/dusted/melted will unbuckle the victim prior to their
gruesome fate, allowing their spirit freedom to no longer haunt the
buckles that bound their mortal form.

* Because apparently we shouldn't trust people to use "delete" properly
2016-06-19 13:24:58 -04:00
monster860
3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
Mieszko Jędrzejczak
1a4f8cb518 Alcohol refactor v12413526345. (#4647)
* Refactors booze. Yes. I killed other commits.

* Lime juice
2016-06-19 11:52:44 -04: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
VampyrBytes
131c600e55 fixes me runtime 2016-06-16 18:57:32 +01:00
TheDZD
831ab328e5 Merge pull request #4683 from Fox-McCloud/patch-tweaks
Chem Patch Tweaks
2016-06-16 10:27:14 -04:00
Lady-Luck
05a3c2cfdf Adds selected character below Setup Character button (#4680) 2016-06-16 05:18:07 -04:00
Fox-McCloud
4835482c53 Chem Patch Tweaks 2016-06-15 06:45:00 -04:00
LittleBigKid2000
7d5d29d610 Rewords various objectives and makes 'Follow the inviolate' always succeed (#4648)
* Rewords various objectives, makes 'Follow the inviolate' always succeed.

* Fixes the capitalization of NanoTrasen

* Fixes inviolate objective so that admins can make it fail, hopefully

* Fixes the thing

* Re-reworded AI hijack objective
2016-06-15 06:32:45 -04:00
VampyrBytes
7979706c5a strips out old emote code 2016-06-14 09:03:39 +01: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