Commit Graph

1323 Commits

Author SHA1 Message Date
Birdtalon 7aa7634d4a fixes crates 2017-08-14 18:05:04 +01:00
Fox McCloud 2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Sam 6e995515ff whoops 2017-08-04 06:20:58 +01:00
Crazy Lemon 59a9df3762 Merge pull request #7906 from Fox-McCloud/remove-cael
Removes Unused Xenoarch Code
2017-08-01 22:15:22 -07:00
Fox-McCloud 6bd0d17527 performance 2017-07-31 14:01:15 -04:00
Fox-McCloud c6465f5be7 yep, still need this 2017-07-29 20:41:38 -04:00
Fox-McCloud 968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Aurorablade 04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -04:00
Crazy Lemon e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
Crazylemon64 9c86d07252 Adds decorative telecomms machinery for map making 2017-07-23 21:08:10 -07:00
Fox-McCloud 027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Fox-McCloud 02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
Fox McCloud 7626942fce Merge pull request #7724 from shazbot194/Honk
Adds in the Jolly Jug
2017-07-12 23:26:51 -04:00
Aurorablade 476cdc3e06 Blood Refactor (#6220)
* commit for branch swap

* branch swap again

* BLEED

* trying to clear up compile errors

* i killed everything when i tested this...

* restorealltheblood

* I REMOVED A THING

* well some progress

* stop bleeding

* got to swap branches again.

* grr

* damn bloodcolors

* Squash everything

* color....colourrrrrrr

* color....colourrrrrrr

* well now that updated the branch...

* Changes

* Some tweaks..before i upload something major

* COLOR NOT COLOUR...COLOR

YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD

* Foot print shit..

blood coloring is going to be PAIN

* trying to handle some colors..maybe.

* blood colorsing sucks..di i mention this?

* commenting cod malfunctions.

* Changes

* lets try this

* Its too late at night.

* blargh

* woops

* almost works...

* progress..

* Branch swap

* figured out the overlay issue....

* BRANCH SWAP

* BLARGH

* fixed merged conflicts..expect something to be horribly wrong.

* bunch of changes

* Major Fixes

 - Moved blood_state and bloodiness var definitions to
 /obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
 order to make blood color work properly.
   - These were not used by any other decal, so it was pointless.
 - Tweaked human/add_blood so that hand_blood_color uses the correct
 value now.
 - Corrected gibs having the wrong basecolor.
 - Tracks of different blood colors will no longer combine weirdly, and
 will instead form seperate overlays.
   - This also fixes all of the issues with tracks in general and not
   updating correctly.
 - Fixed transfering blood in add_fingerprint; the old detective code
 didn't use the new format for add_blood().
 - Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
 own trails. Sprites should probably be brightened later.
 - Fixed mobs occasionally randomly having their blood_DNA list reset.

* may have accidently removed shit.

* Mrowl

* stiff

water is not bleeding
lowered trail making threshold

* tweaks then conflcits

* weee

* indent

* some tweaks

* somefox tweaks.

* derp

* why won't they bleed!?

* BLEED DAMMIT

* Flattist comments and removes simple animale blood volume

Cause i cannot get it to work right.

* PRAISE FLATTIST

* Simple animals have a blood volume now

Bug with trail fixed.

* changes

* thanksmrowlmrowl

* exotice blood trails

* makesure is an exotic bleeder has a bleed rate first...

* FoxBoxTweakSox

* BoxVoxSoXFox

* ONE MORE THING

* animalsbleedreds

* Buh? BUGH!

* thisismescreaming

* removing note needed thing

* Color changes but the rabbit hole continues.

* This is not pretty....

* wot

* IT WORKS DAMMIT

* colors.

* germaphobic commit..

* we have to use the old system

* nothing to see here

* doubleprocarady

* try to fix mulebots

* mulebot fixed

* DONE
2017-07-11 16:49:11 -04:00
Aurorablade fd1a3af3b6 clothes! 2017-07-07 22:44:20 -04:00
shazbot194 c9c3cf3527 Adds in the Jolly Jug
Due to my master exploding, I had to remake a couple of my PRs. This
pull adds in the Jolly Jug, the clown version of nothing. The clown
spawns with it and has a backup in their locker, just like the mime, in
addition it spawns with 100u of banana juice.
2017-07-05 17:36:30 -08:00
Fox-McCloud 42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Crazy Lemon b8d5d530b4 Merge pull request #7690 from Aurorablade/VeryImportentMedicalGear
Adds in an importent piece of medical gear
2017-07-04 11:08:56 -07:00
Fox-McCloud 0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
Aurorablade 97252cd2f8 MEdicalgear 2017-07-01 22:55:40 -04:00
Fox-McCloud bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Kluys 04b02435fb Bob ross painting
While trying to fix my github accidentally closed https://github.com/ParadiseSS13/Paradise/pull/7629 from the shell.

Redid the entire PR.
Changes remained the same
![Image of captains office](https://puu.sh/wuWt0/4ea9796196.png)

🆑 Kluys
Add: Bob ross painting in the captains office called "calming painting".

Also changes around the entertainment monitor and light switch to accomodate.

Fix: Clown painting was named "\improper mech painting"
/ 🆑
2017-06-29 21:28:04 +02:00
tigercat2000 2c935a9a31 Merge pull request #6940 from Citinited/pipe-dreams-travis-woo
Adds the Rapid Pipe Dispenser (RPD)
2017-06-27 13:32:59 -07:00
Crazy Lemon a66a31ee83 Merge pull request #7589 from Vivalas/master
Fixes weird offset with beds when buckled.
2017-06-23 09:26:39 -07:00
Vivalas 84e3ce1b9a Integrates offset better 2017-06-20 17:30:42 -05:00
Vivalas 88f32290fc Fixes bed offset 2017-06-19 20:45:20 -05:00
Fox McCloud 3e065e730e Merge pull request #7554 from SamHPurp/more-qdel-nulls
Uses more QDEL_NULLs
2017-06-19 21:14:39 -04:00
Fox McCloud 0f485fa9df Merge pull request #7562 from SamHPurp/fixes-window-completion-step
Stops multi-windoor creation
2017-06-16 19:55:51 -04:00
Sam d343c6c8cf Fixes implied src's 2017-06-16 22:03:09 +01:00
Fox McCloud 06b4719961 Merge pull request #7529 from Aurorablade/ChaplainClothes
More Chaplain Clothes
2017-06-16 16:10:32 -04:00
Sam 9df64aadd5 Stops multi-windoor creation 2017-06-15 12:21:43 +01:00
Sam d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Sam 1f84807adb dasvidaniya \the 2017-06-14 09:50:47 +01:00
Sam fc1d4a9cb9 Adds cooldown to stop the spam, also uses the right gender pronoun 2017-06-14 06:15:32 +01:00
Aurorablade ef227542e0 typofix 2017-06-11 21:03:21 -04:00
Aurorablade dd22ea0415 missed icons 2017-06-10 22:53:13 -04:00
Sam 7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam 4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Fox McCloud b982080f16 Merge pull request #7258 from KasparoVy/cloning-crating-and-closeting
Fixes Some RCS Issues
2017-06-09 19:23:42 -04:00
Fox McCloud 9acf29f808 Merge pull request #7506 from FlattestGuitar/nice-gloves-whered-you-get-these
Adds forensics gloves
2017-06-09 17:44:19 -04:00
KasparoVy fc93a1f4a6 Amends RCS Sanity 2017-06-08 19:58:27 -04:00
KasparoVy c39d963a25 Fixes #7242, RCS Exploit
You can no longer teleport crates/closets by dialog-stacking if you're
not adjacent to them and if the RCS doesn't have enough charge.
2017-06-08 19:58:27 -04:00
FlattestGuitar 362b19f7bf Adds forensics gloves 2017-06-08 21:21:23 +02:00
tigercat2000 3652c3001a ViewMods - Allows custom view ranges.
The primary function of this is a new button in the "Preferences" tab -
Set View Range. This functions similarly to the admin verb "Change View
Range", but it only allows you to set view ranges lower than the normal
world.view.

Full changelog:
 - Added ViewMods system to clients.
   - Everything that wants to change client.view should do it through
   this system.
   - Currently used by the Set View Range button and Marauders.
   - Stretch mode is set to stretch when active, but the original
   setting is preserved, as long as you set it with no ViewMods enabled.
   - The basic way this works is that it keeps track of /datum/viewmods
   on /clients, and whenever one is added or removed, it picks the
   highest view range out of all of them and sets the client's vision to
   that. This effectively means that, if you, say, set your view range
   to 5x5, and get into a Marauder and use the "zoom" button, it will
   always go to the marauder's zoom level.
   - The HUD is set to minimal mode for any view ranges below
   world.view, which means you only get absolutely critical buttons.
   	- It's set to invisible if you go down to view range 1 or 2,
	because the buttons can't fit on the screen at those view
	ranges.
 - Removed canvas examine option. Just zoom in yourself!
2017-06-07 19:39:33 -07:00
tigercat2000 b419782526 Luxury Bluespace Capsule & More
tgstation/tgstation#27881

There is now a second bluespace shelter capsule, which is much more
fancy & expensive. Note, this still does not make them generally available.

Changes Summary:
 - Added "Shelter Beta" - It comes with a built in kitchen, toilet, shower, three
 course meal, and an artifact™️! There are plenty of secrets to
 behold..
 - Added black carpeting. This can be created by the personal crafting
 menu and having any crayon + a carpet with you.
 - Added fancy wooden and fancy black wooden tables. These are craftable
 by hitting wooden table parts with regular and black carpet,
 respectively.
 - You can now unanchor, deconstruct and color shower curtains. Use any kind of
 crayon to color them, and screwdriver to unanchor them. Once they are
 unanchored, you may use wirecutters to change them back into materials-
 All of which are used in a new crafting recipe for creating them.
 - Display cases moderately refactored.
 - Added survival pod windows/windoors for the new luxury pod.
2017-06-07 11:17:44 -07:00
Fox-McCloud 0daf8a6a7f Object Embedding 2017-06-05 16:37:21 -04:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Tigercat2000 bbca8405ef -tg- Move Refactor
This commit ports /tg/'s move refactor.

The throwing system has been replaced entirely, removing the necessity
of throw_at_fast and resolving multiple outstanding issues, such as
crossbows being unusable.

Spacedrifting has also been upgraded to function with the new throwing
system. It is now it's own process.

Tickcomp has been killed, and the config values have been adjusted to
more or less match live Paradise.

All mobs now share a common Bump() proc. There are only four mobtypes
which do not, including humans and simple animals. With the exception
of mob types that do not ever want to Bump() or be Bumped(), they should
call the parent proc.

Human movement slowdown has been moderately tweaked in how it stacks effects;
It shouldn't be significantly different from a player perspective.

Mobs will now spread fire if they bump into another mob. I don't want to set
the world on fiiiire, I just want start a flame in your heart~

For player facing changes: Input delay has been reduced by roughly ~50ms for
any direction keys, by advantage of a previously unknown flag on byond verbs
which allow them to operate independently from the tick rate of the server.
You may need to clear your interface.dmf file if you have a custom skin for
this change to function.
2017-05-25 06:35:01 -07:00
Tigercat2000 29ae9612fd Fix morgue trays flying away 2017-05-18 11:32:20 -07:00
Fox McCloud 146e3a6540 Merge pull request #7305 from FlattestGuitar/brigerino-kekerino
Adds radios and prisoner IDs to prisoner lockers
2017-05-16 06:47:44 -04:00