Steelpoint
ea3bb2e80b
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler
...
Conflicts:
code/modules/research/designs/mechfabricator_designs.dm
2015-02-06 13:19:15 +08:00
hornygranny
bb188da5bf
Merge pull request #7490 from Miauw62/sayfix
...
Fixes saycode breaking when the ckey of a ghost was set to null.
2015-02-05 11:54:23 -08:00
Swag McYolosteinen
f5359aba3b
Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo
...
Adds photos and some other stuff to security and medical records
2015-02-05 18:45:53 +01:00
Swag McYolosteinen
574fc61c83
Merge pull request #7543 from TZK13/Work-Boots
...
Adds work boots for engineers
2015-02-05 18:15:28 +01:00
Swag McYolosteinen
65a3674969
Merge pull request #7489 from paprka/ghostsa
...
Makes ghosts float up and down ala zero-g
2015-02-05 18:08:38 +01:00
Swag McYolosteinen
aa3f6d8635
Merge pull request #7540 from Delimusca/slimefixins
...
slime feeding hotfix
2015-02-05 18:05:15 +01:00
paprka
468b00a16f
bandaids diseases and bleeding
2015-02-05 01:36:16 -08:00
paprka
f6bf89656b
fixes syringes with monkeys, virus transfers, and iv drip feedback
2015-02-04 12:21:05 -08:00
Lo6a4evskiy
50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
TZK13
8400ec9800
Adds work boots and fixes character setup previews.
2015-02-04 00:32:15 -06:00
Delimusca
4f618c9ca3
fixed slime drag exploits
2015-02-03 22:09:05 -07:00
paprka
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
Cheridan
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
Swag McYolosteinen
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
Razharas
106fbf6347
Merge pull request #7487 from paprka/voxtest
...
Removes voxtest 2, removes /tg/ culture
2015-02-02 15:02:27 +03:00
xxalpha
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
Swag McYolosteinen
920bca9147
Merge pull request #7358 from Delimusca/gooeyfun
...
Minor slime enhancements
2015-02-01 14:04:52 +01:00
Miauw
ffa0a81ecf
gotta go fast
2015-02-01 12:44:22 +01:00
Miauw
ef3a10950a
Fixes saycode breaking when the ckey of a ghost was set to null.
2015-02-01 12:37:49 +01:00
paprka
141bababef
makes ghosts float up and down
2015-02-01 03:37:14 -08:00
paprka
e4b52c3974
removes voxtest 2
2015-02-01 02:11:42 -08:00
paprka
d6dce069f4
finally actually fixes the blood decals
2015-02-01 00:29:37 -08:00
paprka
0b64a23310
fixes blood drips
2015-01-31 23:40:27 -08:00
paprka
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
phil235
b4324a2db4
Fixes typo in CPR logs that switched attacker and victim.
2015-01-30 22:16:48 +01:00
Cheridan
2716046e09
Merge pull request #6817 from Perakp/speed_tweak
...
Cold temperatures slow you down even when there is no gravity.
2015-01-30 14:45:27 -06:00
hornygranny
f7659eb4e5
Merge pull request #7426 from Miauw62/ye_olde_bugfix
...
fixes MMI and pAI teleporting
2015-01-29 10:51:12 -08:00
Miauw
04ad06eca0
Fixed #126 . MMIs and pAIs can now be teleported properly.
...
Revamped the AI get/jump procs to use admin_forcemove(), which makes sure that mobs are moved by setting various vars and then calling Move().
2015-01-29 18:50:48 +01:00
GunHog
2920aa3aa9
Adds the new emotes to the help emote display.
2015-01-28 16:39:25 -06:00
GunHog
5da386c2ad
New Silicon Emotes!
...
Adds the following emotes, all audible:
- buzz2
- chime (MULEbot delivery chime)
- honk, with the pitch variation of the standard bike horn!
- sad, the sad trombone sound from HONK mechs!
- warn, the warning buzzer from newscasters and disposal shutes
I also set the other audible emotes to audio message type.
2015-01-27 12:51:18 -06:00
Swag McYolosteinen
58648d267e
Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas
...
Shuttle Stranding
2015-01-27 17:55:26 +01:00
Steelpoint
359514e239
SecBorgDisabler
2015-01-27 17:24:13 +08:00
Swag McYolosteinen
7b8e2cd0c6
Merge pull request #7109 from Xhuis/whydidthisnotexistanywayfuckingchrist
...
Gives Syndicate cyborgs an operative pinpointer module
2015-01-26 20:18:41 +01:00
Delimusca
f1be4d510c
removed slime naming and 3am comment
2015-01-26 03:08:18 -07:00
paprka
1c59e972ce
adds iv drip and blood packs to the map
2015-01-26 00:21:11 -08:00
paprka
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
Incoming
7b97431a0b
Fixes an edge case with continuous round malf where the round could become unresovable
...
Fixes a spolling errar
2015-01-25 17:49:04 -05:00
Delimusca
8d3e3cf98b
added slime naming verb, dragdrop feeding, and stealing mass from other slimes
2015-01-25 15:16:24 -07:00
Xhuis
ac63bf3d6b
Replaces pinpointer with operative pinpointer
2015-01-25 12:44:19 -05:00
Swag McYolosteinen
1bccc65bc1
Merge pull request #7331 from Iamgoofball/patch-14
...
Makes say mods from genetic disabilties get handled after stuttering
2015-01-25 18:40:24 +01:00
Swag McYolosteinen
ba5c28d6f8
Merge pull request #7323 from Cheridan/weaken_cleanup
...
Fixes Weaken() for Ergo
2015-01-25 15:22:39 +01:00
Lo6a4evskiy
c33992fed0
Code cleanup
2015-01-25 00:04:50 +04:00
Iamgoofball
1ef4df75da
Makes say mods from genetic disabilties get handled after stuttering
2015-01-24 08:30:39 -08:00
Swag McYolosteinen
d26e40a6ee
Merge pull request #7282 from Firecage/SkinningMonkeysXenos
...
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-24 14:06:13 +01:00
Swag McYolosteinen
ab0518ef55
Merge pull request #7203 from Delimusca/theyshootback
...
Night of the living deathwands
2015-01-24 13:55:09 +01:00
paprka
d13288350a
fixes noblood check
2015-01-24 01:51:14 -08:00
paprka
f071655ea4
updates and optimizations
2015-01-24 01:12:57 -08:00
paprka
5361458b51
some updates
2015-01-23 21:00:09 -08:00
Cheridan
d649846100
Fixes Weaken() for Ergo
2015-01-23 22:50:59 -06:00
Cheridan
a5aeb498f2
Merge pull request #6753 from Ergovisavi/abriums_on_fire_rolling
...
Makes aliens process reagents again & Stop, drop 'n roll ignores CANWEAKEN requirement
2015-01-23 22:33:05 -06:00
