2aba5f48ef
Merge pull request #18263 from pudl/big-daddy-thicc-dick
...
Adds bar stools
2016-06-07 12:59:34 +12:00
05b4e82e02
Merge pull request #18272 from xxalpha/nukemyshitup
...
Syndicate toolbox now has syndicate screwdriver.
2016-06-07 12:57:44 +12:00
744b722a12
Merge pull request #18241 from phil235/BloodRefactor
...
Blood refactor stuff
2016-06-07 10:09:35 +12:00
09bb9cbcb9
fixes up some toy sword checks ( #18252 )
...
removes broken check.
Fixes https://github.com/tgstation/tgstation/issues/18248
adds a missing return to account for nodrop items.
2016-06-07 10:02:34 +12:00
35c8e92ad7
Merge pull request #18265 from KorPhaeron/sword_fix
...
Sword Fix
2016-06-06 00:39:09 -05:00
94a5d5bfad
Atom movable that are neither /mob nor /obj should not be picked by the closet insertion proc. ( #18244 )
2016-06-05 12:48:19 -05:00
40a371296a
Adding lizard blood pack in medbay storage's freezer crate.
...
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
2016-06-05 18:12:08 +02:00
69bd3575e3
Merge pull request #18228 from ChangelingRain/swordofRATVAR
...
Additional Ratvar conversion effects and related changes
2016-06-06 01:35:26 +12:00
3e731b117b
Merge pull request #18119 from Cruix/wanted_posters
...
Adds wanted posters, printable from security record computers.
2016-06-06 01:26:35 +12:00
c09046e3f1
Merge pull request #18201 from PKPenguin321/cmo-implanter
...
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
2016-06-06 01:25:52 +12:00
050c42ff5e
Merge pull request #18174 from coiax/holodeck-cold
...
Adds two new holodeck levels
2016-06-06 01:23:43 +12:00
e816738280
Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR
2016-06-05 09:03:22 -04:00
d1dbcd3ee0
Syndicate toolbox now has syndicate screwdriver.
2016-06-05 12:29:45 +01:00
ead7bd090a
Sword Fix
2016-06-04 20:08:38 -05:00
a76f6748bd
adds stupid shitty bar stools
2016-06-04 19:06:52 -05:00
d81db92008
Merge pull request #18214 from coiax/follow-link-define
...
Refactors all (F) links into using a define
2016-06-04 14:36:31 -04:00
bd20c313b9
Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor
...
Conflicts:
code/__DEFINES/genetics.dm
code/modules/mob/living/carbon/human/species_types.dm
2016-06-04 17:41:43 +02:00
b482764a19
- I made human/handle_blood() less shitty.
...
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
2016-06-04 17:33:16 +02:00
c51b1503ac
clockwork windoors
2016-06-04 10:27:27 -04:00
671521c857
layer
2016-06-04 07:37:34 -04:00
f8bd263eec
Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR
...
Conflicts:
icons/effects/effects.dmi
2016-06-04 07:34:13 -04:00
65ba2d2800
Makes cloth not have force anymore. ( #18204 )
2016-06-04 01:23:29 -05:00
3793e6187a
Addition Ratvar conversion effects and related changes
2016-06-03 23:19:13 -04:00
6fd1424619
Merge pull request #18085 from Xhuis/earsplitting_string
...
Clockwork Patch III
2016-06-03 19:55:04 -04:00
7c8603a0a8
important features ( #18195 )
2016-06-03 14:48:12 -05:00
4abcc87af4
Minor EfficiencyStation changes ( #18157 )
...
- Adds syringes and beakers to Xenobiology
- Replaces map edited grille-or-trash spawner with coded one
- Adds restroom to virology
2016-06-03 14:47:03 -05:00
a9a97f5a81
Fixes for Merge Tokens ( #18168 )
...
* fixes #15649
fixes #16575
* oops forgot those lines
2016-06-03 14:46:42 -05:00
2b18993b04
Conflicts II
2016-06-03 15:42:19 -04:00
70795389df
More stuff, no conflict fix yet
2016-06-03 15:07:49 -04:00
e13725b179
Refactors all (F) links into using a define
...
🆑
bugfix: Clicking the (F) link when an AI talks in binary chat will
follow its camera eye, the same as when (F) is clicked for its radio
chat.
/🆑
FOLLOW_LINK is a define that creates the clickable (F) link, so it
doesn't have to be typed painstakingly out every time we want to give
that link to an observer.
2016-06-03 15:29:28 +01:00
4c8f8ae53e
Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
...
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
01281044a1
refines autoimplanter code, replaces CMO eye HUD augment in locker with single use eye HUD augment autoimplanter
2016-06-02 23:23:52 -07:00
685d938481
Some more work or something, idk
2016-06-02 20:53:51 -04:00
5c3c84dad8
Merge pull request #18137 from ChangelingRain/airblocked
...
False walls now block air
2016-06-03 09:29:08 +12:00
7e93e762f5
Follow-up commit
2016-06-02 14:55:48 -04:00
9fdae2fe4e
Merge pull request #17576 from LatD/Research
...
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
546bb633cd
Adds two new holodeck levels
...
- Winter Wonderland
Apparently no one paid for christmas decorations, and it's
incredibly cold and low pressure. But it's a good counter
to a burn mix.
- Anthophila
"A simulation of a bee colony? Why is this in the restricted
section?" - Victim of the holodeck bee massacre
2016-06-02 16:34:41 +01:00
cf71a5833f
repaths plant analyzers
...
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00
709fbc0263
Removed some old paranoid checks and useless photo creates.
2016-06-01 22:40:35 -04:00
5d91f7c0ea
fix!
2016-06-01 20:17:48 -04:00
c27a9a21bb
Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus
...
Adds letterman jackets
2016-06-02 09:01:29 +12:00
3068603350
False walls now block air
2016-06-01 16:29:38 -04:00
9b8c68e704
Merge pull request #18065 from coiax/blood-box
...
Adds "blood freezer" to map; replaces freezer of blood packs
2016-06-01 00:51:52 -05:00
896cfc3321
Adds wanted posters, printable from security record computers.
2016-05-31 22:27:30 -04:00
6878e9fddb
Adds luminosity to lasers and sparks. ( #18090 )
2016-05-31 21:18:09 -05:00
7259a6370c
Merge pull request #18086 from KorPhaeron/Igotpaid30dollarstodothis
...
New Chaplain Weapons + Mass Driver buff
2016-05-31 19:54:54 -04:00
fa4ca9877c
New clockwork wall/floor sprites ( #18079 )
...
* New clockwork wall/floor sprites
* 360 conflict dodging
* improved sprites
* new sprites
* smoother despawn
* clang
2016-05-31 18:49:34 -05:00
d5dddf5bae
Kills the sword ghost properly
2016-05-31 17:13:59 -05:00
8d65a58e2c
Fixes sword naming
2016-05-31 16:13:25 -05:00
9042c84087
The sword names itself now
2016-05-31 13:28:36 -05:00
oranges
PKPenguin321
Cheridan
phil235
phil235
Nerd Lord
xxalpha
KorPhaeron
pudl
TechnoAlchemist
MMMiracles
coiax
Thunder12345
Xhuis
Jordie
Razharas
unknown