Commit Graph

2599 Commits

Author SHA1 Message Date
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
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
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
TheDZD
c983034b82 Merge pull request #4718 from Fox-McCloud/actual-fix
Actually Fixes Traitor-Vamp
2016-06-19 13:25:06 -04:00
TheDZD
4df4b58bc1 Merge pull request #4687 from Fox-McCloud/crouching-warden-hidden-greytide
Gives Warden Krav Maga Gloves
2016-06-19 13:13:11 -04:00
Fox-McCloud
c04c4dcd3f steal that stuff 2016-06-19 13:04:59 -04:00
monster860
3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -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
Fox-McCloud
3dd9a714fc Actually Fixes Traitor-Vamp 2016-06-19 09:05:13 -04:00
Twinmold93
434cce64ec Adjustments to Revenant Abilities (Nerf) (#4693)
Changes some variables in Revenant abilities. Not as extreme as
suggested by some people, but definitely a nerf to Revenants.

This change lowers the amount of confusion from Revenants from 50 to 20
per use of Defile.  This also adds in a maximum confusion of 30 that
Defile can give someone. Finally, this lowers the range of malfunction
from 4 tiles to 2 tiles, as it still uses an EMP function which makes it
an instant kill against IPCs, and greatly incapacitating anyone with
mechanical organs (especially heart).

The numbers for confusion also come out to about equal seconds.

🆑 Twinmold
Tweak: Lowers the range of Malfunction from 4 tiles to 2 tiles, due to
ability to insta-kill IPCs/incapacitate those with mechanical hearts.
Tweak: Lowers amount of confusion given from Revenants from 50 to 20 per
Defile.
Fix: Sets a maximum confused amount from the Revenant's Defile ability
(now 30).
/🆑
2016-06-17 05:44:34 -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
Lady-Luck
608b7c2643 Removes Stealing a RCD as an objective (#4652)
* Removes Stealing a RCD as an objective.

* Fixed
2016-06-13 23:04:16 -04:00
VampyrBytes
15ef6c7f46 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-06-13 18:27:01 +01:00
monster860
42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
TheDZD
a2f2da09b9 Merge pull request #4608 from Fox-McCloud/remove-mindslave
Can Deconvert Mindslaves and Vampire Thralls
2016-06-11 12:11:34 -04:00
Fox-McCloud
e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
monster860
64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Fox-McCloud
eb653a68c8 Can Deconvert Mindslaves 2016-06-06 10:32:57 -04:00
Fox McCloud
fa5bf9871d Merge pull request #4570 from Tastyfish/blub
Fixes spores recursively dying forever
2016-06-02 20:21:01 -04:00
Tastyfish
92d20cb985 Fixes spores recursively dying forever 2016-06-02 20:11:59 -04:00
Tastyfish
57abc28c73 Fixes holsters and potentially other accessories with action buttons 2016-06-01 20:30:57 -04:00
TheDZD
4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
TheDZD
f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
TheDZD
8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD
164810577d Merge pull request #4526 from CrAzYPiLoT-SS13/ohgodthisisold
Fixes an oldie
2016-05-30 11:57:10 -04:00
Fox-McCloud
25477b0bbf clean up 2016-05-29 22:05:20 -04:00
Fox-McCloud
aab2ad8443 Telecrystal Fix 2016-05-29 03:55:57 -04:00
Matt
4f49c18cef whywouldyouleaveit 2016-05-28 21:45:21 +02:00
VampyrBytes
df3b180af4 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-05-26 12:32:47 +01:00
TheDZD
6e2b236f81 Merge pull request #4480 from Fox-McCloud/simple-animal-loot-refactor
Simple Animal Loot Refactor
2016-05-22 18:31:43 -04:00
TheDZD
2e97cb8cd0 Merge pull request #4478 from DaveTheHeadcrab/SyringeIcons
Updates Syringe Icons
2016-05-22 16:32:47 -04:00
SamCroswell
1bf59c22ef Bows Down to Overlord DZD 2016-05-22 16:28:23 -04:00
Fox-McCloud
54b02d7ea0 Simple Animal Loot Refactor 2016-05-20 21:48:29 -04:00
Fox McCloud
db4ae11b7f Merge pull request #4469 from QuinnAggeler/swarmer-fix1
Stops swarmers from eating the PA or releasing the engine
2016-05-20 16:55:02 -04:00
HugoLuman
50a114116b Removes unneeded else 2016-05-20 13:17:05 -07:00
HugoLuman
fff7181da8 Reinforces the PA protection
Adds back in protection for obj/machinery/particle_accelerator and its children, since the PA console is still parented to it.
2016-05-19 17:37:14 -07:00
HugoLuman
e02222f11f Check actually works now
Tested it. Hopefully that's the last commit needed.
2016-05-19 17:31:35 -07:00
HugoLuman
ee438cca12 Update swarmer.dm 2016-05-19 16:09:38 -07:00
HugoLuman
0e424a0efd Finishes that check with a return at the end 2016-05-19 16:06:18 -07:00
HugoLuman
3c66a76e0a Adds a (!powered) check to field generators
Now they can eat the ones in storage but not the ones holding in the engine
2016-05-19 16:02:43 -07:00
HugoLuman
80cfaf0793 Fixes typepath of PA parent object
Corrects /obj/machinery/particle_accelerator/swarmer_act(
to /obj/structure/particle_accelerator/swarmer_act(
I'm guessing that whoever originally coded that missed the typepath and then added all the procs for the child objects because swarmers were still able to eat the PA
Now that it's fixed, the child checks should be unnecessary
2016-05-19 15:41:11 -07:00
HugoLuman
42305e9dee Adds missing ) 2016-05-19 14:16:11 -07:00
HugoLuman
44c4c23337 Stops swarmers from eating the PA or releasing the engine
Fixes the erroneous typepaths that protected two unused machinery objects instead of two actual parts of the PA
Stops swarmers from eating field generators. While it may have been intentional for them to eat the ones in secure storage, they could also eat the ones holding in the engine
Attempts to stop swarmers from accessing the engine (and depressurizing adjacent areas) in the first place. I believe the "no breach" only checking for space turfs (rather than airless plating) was an oversight, as it would allow them to causes breaches in other areas as well
2016-05-19 14:01:24 -07:00
TheDZD
8956e0a8b2 Merge pull request #4464 from Fox-McCloud/tatorvamp-fix
Fixes TraitorVamp Chaplains
2016-05-19 16:38:56 -04:00
Fox-McCloud
986b65fcfa Fixes TraitorVamp Chaplains 2016-05-19 02:34:38 -04:00
Tigercat2000
cc8cfe8ab6 Abductor probing console human icon
fixes the lack of occupant icon on the probing console
2016-05-16 04:05:03 -07:00