Commit Graph
1013 Commits
Author SHA1 Message Date
Fox McCloudandGitHub 010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral
Titanium
2018-02-21 03:20:20 -05:00
uraniummeltdown edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
tigercat2000andGitHub 93610061e0 Merge pull request #8590 from IK3I/RiseOfSpork
The Utensil of the future!
2018-02-05 12:49:59 -08:00
uraniummeltdown 369c654c70 moves material defines to construction.dm
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
2018-02-06 01:24:36 +05:00
tigercat2000andGitHub 04172bddf4 Merge pull request #8416 from Fox-McCloud/xenobio-console-change
Slime Blueprint Change
2018-01-29 18:38:16 -08:00
IK3I f94f77fc50 The Utensil of the future! 2018-01-23 18:45:55 -06:00
Aurorablade 7f5f4243fc proc tweak and name change 2017-12-14 12:15:33 -05:00
Aurorablade 27da7b9972 DENIED 2017-12-14 00:38:03 -05:00
Fox-McCloud 58baf8a487 Slime Blueprint Change 2017-12-02 20:08:30 -05:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Squirgenheimer 66b7b26b21 Fixes typo for energy crossbow 2017-10-25 10:10:43 -04:00
uraniummeltdown fe9fba469b adds the RPD to autolathe and engiborgs, adjusted RPD materials to match the expensive autolathe price 2017-09-25 19:43:54 +04:00
TDSSS 8fe6480b37 Gives immolator unique ID 2017-09-19 15:28:57 +02:00
tigercat2000 ec159814e2 Add vv_can_delete, kill last vestiges of 'forbidden objects' 2017-09-15 17:27:33 -07:00
tigercat2000andGitHub 484af3afc4 Merge pull request #7827 from FalseIncarnate/plumbing
Plumbing Update
2017-09-12 20:20:23 -07:00
FalseIncarnate 3ea892b813 Orderable bathroom fixtures and autolathe mirrors
Adds two new crates to supply ordering:

Urination Station Crate, contains one toilet in a box and one urinal in
a box. Costs 10 points.

Hygeine Station Crate, contains one sink in a box and one shower
fixture. Costs 10 points.

Mirrors can now be produced in an autolathe from glass.
2017-08-06 21:31:18 -04:00
Crazy LemonandGitHub 59a9df3762 Merge pull request #7906 from Fox-McCloud/remove-cael
Removes Unused Xenoarch Code
2017-08-01 22:15:22 -07:00
Birdtalon bdd7cc4c27 Fixes lathe_time_factor to correct values 2017-07-31 22:46:37 +01:00
Birdtalon 5dcb44c3d5 fixed silly mistake 2017-07-31 22:10:26 +01:00
Birdtalon e5e3293289 rebalances stock part printing times for RND 2017-07-31 21:57:11 +01:00
Fox-McCloud 968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Birdtalon 5d1545f996 Fox McCloud changes request 2017-07-27 22:15:07 +01:00
Birdtalon ad9bbd36f9 Modifies rdconsole.dm protolathe speed coefficient 2017-07-27 15:03:58 +01:00
Fox-McCloud 027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
AurorabladeandFox McCloud 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 354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
Fox-McCloud 549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud e93e4ef090 IPC arm recharger mechfab 2017-07-04 15:28:14 -04:00
Fox-McCloud 05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Fox-McCloud b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Fox-McCloud 6ea2c73b39 derp 2017-06-28 17:32:40 -04:00
Fox-McCloud 6bb4056a87 fix 2017-06-28 17:12:14 -04:00
Fox-McCloud e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud 585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
tigercat2000andGitHub c6560ef23e Merge pull request #7501 from Fox-McCloud/illegal-implants
Replaces Illegal R&D Gear with Other Implants
2017-06-09 14:49:38 -07:00
Fox-McCloud 72557e1c88 Replaces Illegal R&D Gear with Other Implants 2017-06-07 21:27:25 -04:00
Fox-McCloud e0ea07fc86 Fixes/Tweaks Old Origin Techs 2017-06-03 12:11:46 -04:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox McCloudandGitHub 1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight
Refactoring to use the WEIGHT_CLASS defines.
2017-05-28 14:17:05 -04:00
Sam 2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox McCloudandGitHub 3587aad06e Merge pull request #6612 from Crazylemon64/partial_cloning
Cloning now puts you together bit by bit
2017-05-27 14:48:23 -04:00
tigercat2000andGitHub 7110e7cd6e Merge pull request #6772 from Kyep/mech_weapons
Ports tesla mech gun, also adds xray/immolator guns
2017-05-22 13:01:10 -07:00
Crazylemon64 8a065238e8 Cloning now puts you together bit by bit 2017-05-01 05:34:12 -07:00
Crazylemon64 1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Markolie d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Crazy LemonandGitHub f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull
Converts Most Destroys to use QDEL_NULL
2017-04-05 23:49:19 -07:00
Fox McCloudandGitHub 4fd0ca5d82 Merge pull request #7029 from davipatury/rcl-design
Gives RCL an autolathe design
2017-04-06 02:33:32 -04:00
Fox McCloudandGitHub 4ad7cd17fd Merge pull request #7043 from SamHPurp/assorted-fixes
Fixes
2017-04-05 19:15:12 -04:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00