Commit Graph

353 Commits

Author SHA1 Message Date
tigercat2000
7902c26833 Merge pull request #8359 from uraniummeltdown/airlock
Airlock Code Update + Tweaks
2017-12-02 11:33:23 -08:00
uraniummeltdown
3dd6fcc040 moved emagged airlock message to examine()
highsec airlocks built with 4 plasteel too
adds science airlocks to metal recipes and RCD
adds hatch and maint hatch to RCD
improve door assembly construction messages
2017-11-29 21:21:20 +04:00
uraniummeltdown
74755d4c60 removed req_amount from stack_recipe_list 2017-11-29 20:09:48 +04:00
Ty-Omaha
9cb754ba57 gets rid of an unneeded ( 2017-11-25 12:17:36 -05:00
Ty-Omaha
e96ad102f9 investigate log stuff 2017-11-25 12:03:58 -05:00
uraniummeltdown
de08b914bb gave door assemblies names
added vault door assembly made with 4 plasteel sheets
centcom/ele airlocks have their own assembly
emagged airlock has a different desc
screwdrivering an airlock now displays a message
electronics go into assembly after do_after
2017-11-11 10:13:23 +04:00
tigercat2000
367f0f1ca2 Merge pull request #8155 from FalseIncarnate/windows
Windows Update
2017-11-10 22:00:19 -08:00
FalseIncarnate
66f10657bd fix merge conflicts (again) 2017-11-04 17:37:30 -04:00
FalseIncarnate
c1e1dc22d8 merge conflict fix 2017-10-28 18:38:20 -04:00
Aurorablade
f1c60a52ba Balance 2017-10-20 18:44:59 -04:00
FalseIncarnate
1a43297db6 merge conflict fix 2017-10-15 21:47:14 -04:00
FalseIncarnate
9018195366 Windows Update
Your computer will restart in-

No, not that kind of Windows Update!

Updates windows code (and not delete sys32) to be better in various
regards

Full windows now have double the health of their directional
counterparts. You spend twice the glass, you get twice the integrity!

You can now build one directional OR full windows on grilles, as well as
select the direction of the one directional window you are building on
the grille!
- This is largely quality of life, saves some time on the actual
repairing / building of windows.

🆑
tweak: Full windows are now 100% stronger than before, so you don't have
to pick strength over security.
tweak: Full windows now take longer to deconstruct so they offer
slightly better security against break-ins. Toolspeed does apply.
rscadd: Full and directional windows can be built on grilles now, and
you can even pick the direction! Technically both a tweak and an
addition...
/🆑
2017-09-28 02:31:52 -04:00
FalseIncarnate
0b2e393507 Arcade Carpetting
Adds arcade carpet to (obviously) the arcade
- Credit to Goonstation for the arcade carpet sprites

Adds arcade carpet as a prize in the prize counter.

Adds a security camera and holopad to Metastation pad

Adds stools to both arcades and rearranges the arcade games in the
Cyberiad arcade
2017-09-19 21:39:24 -04:00
Vivalas
dc0a008fe2 Merge branch 'master' into splint_nerf 2017-08-13 23:13:24 -05:00
Fox-McCloud
cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -04:00
Fox-McCloud
ac32b14910 fix 2017-07-12 03:52:56 -04:00
Fox-McCloud
e02946f3e7 Blood Refactor Fixes 2017-07-12 02:14:53 -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
Fox-McCloud
d3b04e2638 oops 2017-06-29 20:10:13 -04:00
Crazylemon64
72841c9e70 Refactors TK to work a bit more consistently
Also allows remote stack manipulation shenanigans
2017-06-22 23:24:37 -07:00
Vivalas
dcf46204c9 Splint nerf 2017-06-21 15:01:23 -05: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
tigercat2000
6573daf8d5 Merge pull request #7440 from Aurorablade/Cutouts
Ports Cardboard cutouts
2017-06-07 11:13:04 -07:00
Aurorablade
952f6ffd0b itsucanny 2017-06-01 20:02:44 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Fox McCloud
195a907ffe Merge pull request #7123 from SamHPurp/Fixes
Fixes
2017-05-15 19:21:01 -04:00
uraniummeltdown
53447ef17b new runed girder icon from tg, harvesters can summon cult walls and floors and enviro smash set to 3, made cult girders a subtype of girder, fixed girder subtype names, fixed adding runed metal to runed girder not working, summoned cult walls do not drop girder or runed metal 2017-04-24 21:30:08 +04:00
Sam
d1f43dbd9a Dresser is constructible and moveable. 2017-04-23 02:41:01 +01:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Fox McCloud
4d18372353 Merge pull request #6925 from SamHPurp/fixes-abductors
Refactors Stool/Bed/Chair deconstruction + adds Psych's bed recipe + bug fixes
2017-03-27 04:33:30 -04:00
Crazy Lemon
09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities
Fixes Stack Merge Oddities
2017-03-26 23:27:58 -07:00
Sam
0b7a95933c Refactors bed/chair/stool deconstruction + more
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
2017-03-26 15:50:49 +01:00
Ty-Omaha
b0d8c819e6 Swaps them 2017-03-25 14:26:27 -04:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Fox McCloud
456b1ad6a6 Merge pull request #6795 from uraniummeltdown/silver
Plain and Fancy Gold and Silver Tiles
2017-03-24 18:58:09 -04:00
uraniummeltdown
4762c96779 fixed metal rods max amount error, added old gold tile sprites, added recipes for gold and silver tiles to change them into fancy versions 2017-03-24 14:10:17 +04:00
Fox-McCloud
9ed89ef7cd Fixes Stack Merge Oddities 2017-03-24 04:44:04 -04:00
Fox McCloud
8a257e425e Merge pull request #6789 from uraniummeltdown/playball
Baseball Bats, Baseball Burgers
2017-03-21 14:38:03 -04:00
uraniummeltdown
cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
uraniummeltdown
5180002295 add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat 2017-03-16 22:33:24 +04:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Fox McCloud
6bfd4013c0 Merge pull request #6753 from uraniummeltdown/grilles
Grille Code Update
2017-03-15 07:48:17 -04:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown
2af6b1de23 grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup 2017-03-12 16:35:24 +04:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Fox McCloud
d6da6e3f52 Merge pull request #6527 from davipatury/modular_computers
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
Fox McCloud
9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Crazylemon64
869c9b76c4 Streamlines the ghost-to-player creation process
Also refactors ERT equipment to be actual outfits instead of hardcoded
2017-03-08 05:49:49 -08:00