5610b46a0f
Merge pull request #7528 from paprka/clothessec
...
Some clothing changes
2015-02-07 17:00:36 -06:00
b2ad540f78
needed the key,
...
I dont like this whole function and am kinda feeling to kill it all.
2015-02-07 20:52:45 +00:00
1246f14dd1
incorrect proc name
2015-02-07 20:37:49 +00:00
ae0b1cf606
remove some duplicate code
2015-02-07 15:52:11 +00:00
e154d69b0b
* Fixes warnings related to add_reagent when trying to inject blood containing reagents
...
* Fixes sleepers showing reagent id instead of name
* Some formatting adjustments to the mass spectrometer output
* Make the "Saline-Glucose Solution" name fit in one line.
2015-02-07 16:32:25 +01:00
fa9cadfb09
AI's tracker now properly reports AFK borgs
...
- Adds borg client check to the Status screen for the AI
2015-02-06 16:15:28 -06:00
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
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
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
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
574fc61c83
Merge pull request #7543 from TZK13/Work-Boots
...
Adds work boots for engineers
2015-02-05 18:15:28 +01:00
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
aa3f6d8635
Merge pull request #7540 from Delimusca/slimefixins
...
slime feeding hotfix
2015-02-05 18:05:15 +01:00
468b00a16f
bandaids diseases and bleeding
2015-02-05 01:36:16 -08:00
f6bf89656b
fixes syringes with monkeys, virus transfers, and iv drip feedback
2015-02-04 12:21:05 -08:00
50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
7903aba6d3
Adds optional population caps for those that want them. These be dark measures, so tread carefully ye who dare enter this place.
...
There are three "levels" of popcaps, and you can use them in any assortment you like:
The "soft" cap produces a message on join, and takes no action.
The "hard" cap disallows joining whilst too many other people are alive and playing in game, but allows observing.
The "extreme" cap prevents people from joining the server at all while the cap is exceeded. It won't kick out people who failed to qualify during roundstart, but if they leave they won't be able to get back in.
In each case a customizable message config option has been given. Admins are also immune to most population caps (they still are hit by the ones in job shuffling, but can late join as normal afterwards)
2015-02-04 01:58:02 -05:00
8400ec9800
Adds work boots and fixes character setup previews.
2015-02-04 00:32:15 -06:00
4f618c9ca3
fixed slime drag exploits
2015-02-03 22:09:05 -07:00
495ae29ab8
helmet, armor, and corgi changes
2015-02-03 19:12:38 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
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
106fbf6347
Merge pull request #7487 from paprka/voxtest
...
Removes voxtest 2, removes /tg/ culture
2015-02-02 15:02:27 +03:00
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
920bca9147
Merge pull request #7358 from Delimusca/gooeyfun
...
Minor slime enhancements
2015-02-01 14:04:52 +01:00
ffa0a81ecf
gotta go fast
2015-02-01 12:44:22 +01:00
ef3a10950a
Fixes saycode breaking when the ckey of a ghost was set to null.
2015-02-01 12:37:49 +01:00
141bababef
makes ghosts float up and down
2015-02-01 03:37:14 -08:00
e4b52c3974
removes voxtest 2
2015-02-01 02:11:42 -08:00
d6dce069f4
finally actually fixes the blood decals
2015-02-01 00:29:37 -08:00
0b64a23310
fixes blood drips
2015-01-31 23:40:27 -08:00
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
b4324a2db4
Fixes typo in CPR logs that switched attacker and victim.
2015-01-30 22:16:48 +01:00
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
304bc82ff0
Adds a necromantic stone capable of bringing 3 people back as skeletons bound to the user's will. Wizards can buy these.
2015-01-30 17:41:46 +00:00
f7659eb4e5
Merge pull request #7426 from Miauw62/ye_olde_bugfix
...
fixes MMI and pAI teleporting
2015-01-29 10:51:12 -08:00
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
2920aa3aa9
Adds the new emotes to the help emote display.
2015-01-28 16:39:25 -06:00
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
58648d267e
Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas
...
Shuttle Stranding
2015-01-27 17:55:26 +01:00
359514e239
SecBorgDisabler
2015-01-27 17:24:13 +08:00
7b8e2cd0c6
Merge pull request #7109 from Xhuis/whydidthisnotexistanywayfuckingchrist
...
Gives Syndicate cyborgs an operative pinpointer module
2015-01-26 20:18:41 +01:00
f1be4d510c
removed slime naming and 3am comment
2015-01-26 03:08:18 -07:00
1c59e972ce
adds iv drip and blood packs to the map
2015-01-26 00:21:11 -08:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
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
8d3e3cf98b
added slime naming verb, dragdrop feeding, and stealing mass from other slimes
2015-01-25 15:16:24 -07:00
ac63bf3d6b
Replaces pinpointer with operative pinpointer
2015-01-25 12:44:19 -05:00
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
Cheridan
Matt Smith
Menshin
GunHog
Steelpoint
paprka
hornygranny
Swag McYolosteinen
Lo6a4evskiy
Incoming
TZK13
Delimusca
Razharas
xxalpha
phil235
Remie Richards
Xhuis