Commit Graph

1030 Commits

Author SHA1 Message Date
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
d1750d15f2 derp 2018-04-24 02:28:02 -04:00
Fox McCloud
d216cf06b1 sprite revert 2018-04-24 02:14:58 -04:00
Fox McCloud
cadfeea3de consistency 2018-04-23 22:50:11 -04:00
Fox McCloud
a58c2a8693 smelter to components 2018-04-23 19:56:27 -04:00
Fox McCloud
eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Fox McCloud
0b32cba04d bluespace in R&D 2018-04-22 07:24:17 -04:00
Fox McCloud
9adfe9542a whoops 2018-04-22 00:44:41 -04:00
Fox McCloud
4306d27521 circuit imprinter update 2018-04-22 00:34:06 -04:00
Fox McCloud
7acc4c686a almost forgot 2018-04-21 20:35:39 -04:00
Fox McCloud
32e3a25070 got it 2018-04-21 20:25:14 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud
b3fa91030b oops 2018-04-15 22:41:42 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
EldritchSigma
15d30b457e Fixes Mech Disablers being not printable half the time
Apparently the Firedart and Mech-Disabler have the same ID for some bizarre reason. This PR fixes it. Its a minor fix and my first PR. Its basicly just changing one line to fix this pretty decent mech weapon to make it printable like it is every now and then.

Cause its weird that you can print it from round to round, but most of the time you can only print the stupid firedart.
2018-03-30 19:20:51 +02:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Fox McCloud
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
tigercat2000
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
tigercat2000
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
tigercat2000
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 Lemon
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
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
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