Commit Graph

2082 Commits

Author SHA1 Message Date
AnturK
19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
oranges
2aba5f48ef Merge pull request #18263 from pudl/big-daddy-thicc-dick
Adds bar stools
2016-06-07 12:59:34 +12:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
phil235
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
phil235
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
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR
Additional Ratvar conversion effects and related changes
2016-06-06 01:35:26 +12:00
oranges
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
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold
Adds two new holodeck levels
2016-06-06 01:23:43 +12:00
pudl
a76f6748bd adds stupid shitty bar stools 2016-06-04 19:06:52 -05:00
phil235
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
phil235
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
Nerd Lord
c51b1503ac clockwork windoors 2016-06-04 10:27:27 -04:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Xhuis
2b18993b04 Conflicts II 2016-06-03 15:42:19 -04:00
Xhuis
70795389df More stuff, no conflict fix yet 2016-06-03 15:07:49 -04:00
Jordie
4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
PKPenguin321
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
Xhuis
685d938481 Some more work or something, idk 2016-06-02 20:53:51 -04:00
oranges
5c3c84dad8 Merge pull request #18137 from ChangelingRain/airblocked
False walls now block air
2016-06-03 09:29:08 +12:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
Jack Edge
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
PKPenguin321
cf71a5833f repaths plant analyzers
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00
Nerd Lord
5d91f7c0ea fix! 2016-06-01 20:17:48 -04:00
Nerd Lord
3068603350 False walls now block air 2016-06-01 16:29:38 -04:00
Cheridan
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
oranges
b654016574 Merge pull request #17936 from MMMiracles/ruin_stuff
Adds some spawnable shuttle templates for admin memery
2016-05-31 15:58:12 +12:00
Jack Edge
37acbe9990 Adds "blood freezer", adds to map
No actual changes to the maps themselves, just moving
the bloodpack spawns from map into code.
2016-05-31 00:49:42 +01:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
xxalpha
0d608250fa Changed AI core programming so it functions like the AI Upload. (#18004) 2016-05-30 10:54:50 +12:00
Joan Lung
325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free
Head Megaphones + Megaphone changes
2016-05-28 10:40:31 -04:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
Cheridan
27825e6584 Merge pull request #17930 from ChangelingRain/tabling
Fixes glass tables not producing debris when broken
2016-05-27 15:03:35 -05:00
Cheridan
d5a95e093b Merge pull request #17896 from phil235/PullvsGrab
Merges Pull and Grab into a single functionality.
2016-05-26 15:51:46 -05:00
GunHog
70380bc0d5 Head Megaphones
Adds megaphones to CE, CMO, and RD lockers.
2016-05-26 14:24:17 -05:00
LatD
a6680b9f06 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-26 19:02:46 +03:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
MMMiracles
5cb4336ba3 shuttles 2016-05-25 19:45:42 -04:00
phil235
129295be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into PullvsGrab
Conflicts:
	code/__DEFINES/misc.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
2016-05-25 23:48:00 +02:00
phil235
4b4bbb28cc can't choke people with breathing tubes.
another tiny fix with tablepush.
2016-05-25 23:22:03 +02:00
Nerd Lord
eeb7d43730 It's a style thing 2016-05-25 12:05:23 -04:00
Nerd Lord
8f138abaf4 INSIDE the parenthesis! augh! 2016-05-25 12:01:55 -04:00
Nerd Lord
ab59c4cc78 Fixes glass tables not producing debris 2016-05-25 12:00:04 -04:00
LatD
f36237a67d Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-25 18:45:31 +03:00
Xhuis
382c58cf23 Maybe now? 2016-05-24 18:25:20 -04:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
Cheridan
6d6711facb Merge pull request #17822 from optimumtact/keepphilfromkillinme
MakeSlippery proc made more readable with named arguments
2016-05-24 11:59:24 -05:00
AnturK
802cdf9f5c Merge pull request #17839 from optimumtact/watisgoinon
Fix an antipattern when using canUseTopic
2016-05-24 17:46:11 +02:00
phil235
11ca987acb Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.
Two mobs can no longer pull the same mob at the same time. Pulling someone break any other pull/grab from other mob on that person.

The grab item is gone entirely.

You can now only grab one mob at a time, instead of two (one for each hand).

Being aggressively grabbed or more now counts as being restrained (like handcuffed). A neck grab or more makes you lie down and prevents you from getting up until the grab is broken.

Fixes movement when moving with a grabbed person.
Fixes movement when moving a pulled person around you diagonally.
Fixes neckgrab moving the victim on your turf even if the turf is dense.
2016-05-24 01:28:04 +02:00