6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
2e61607d3f
Merge pull request #10105 from xxalpha/chief
...
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
7568861a57
Merge pull request #10102 from xxalpha/chef
...
Fixed being able to interact with electropack while wearing it.
2015-06-24 10:07:45 -05:00
d18a98864a
Remove optimization code.
2015-06-24 01:14:20 +01:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
16504ef0cf
Cleaned some clothing flags. Ported turf/Entered optimization from vg.
2015-06-23 01:52:14 +01:00
0d6ac5c30c
Fixed being able to interact with electropack while wearing it.
2015-06-22 23:16:22 +01:00
e6b738734a
Merge pull request #8876 from xxalpha/fixfixfix
...
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
c79963f7b7
Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
...
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
bc7d1ab93d
Changes the way the airlock charge works
2015-06-19 14:46:06 -04:00
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
0bf6f09969
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
...
Conflicts:
code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
fd27d9d3bb
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
bc11259282
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
a67de221cc
JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging
2015-06-14 23:37:35 +10:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
4de75c539f
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/table_frames.dm
code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
d2ef043690
Resolved Conflicts:
...
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
7363088cbc
Merge pull request #9802 from Miauw62/AyeEye
...
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
a881478743
Removes strip_html_properly(), replaces it with html_encode().
...
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
59d9098d26
Gang Update
2015-06-10 23:05:58 -06:00
50e49d1136
FEATURES SIX AND SEVEN: Suicide msg's and cloaks
2015-06-10 14:17:38 -04:00
7ddcbb1967
Tweak and fixes
...
- Made the interactions into defines.
- Fixed a runtime for when an AI tries to set a DNA lock.
2015-06-09 14:45:38 -05:00
d3fbacc224
Tweaks
...
- Sorts out the transfer_ai() proc, it can now be added to practically
anything you wanted to give to an AI.
- Moved mech functions to the unused middle click.
2015-06-08 20:46:01 -05:00
b572db24c5
Adds AI functionality
2015-06-08 18:26:41 +02:00
46a4d6fe8f
Adds PDA-Message Photo Attachment
2015-06-08 17:40:24 +02:00
0444bd82e4
FEATURE THREE: Airlock charges
2015-06-06 11:55:08 -04:00
3c59772025
Polishes the AI nerfs a bit:
...
* Removed camera wires.
* Tracking time is now dependant on distance to eye instead of core.
* AI detectors will light up when the AI tracks you.
Also added a changelog.
2015-06-06 16:51:09 +02:00
9cb1061bfb
Fixed hacking from inside machines and more.
2015-06-06 11:34:12 +01:00
9e65cdeb6a
Merge pull request #9391 from Ikarrus/gangmessaging
...
Gang-Wide Messages
2015-06-05 22:01:54 -05:00
05072bcf31
Merge pull request #9771 from xxalpha/dropitlikeits
...
Fixed PDA accepting items when spessmen can't drop items.
2015-06-04 20:04:04 -05:00
ecb15b21c2
Fixed PDA accepting items when spessmen can't drop items.
2015-06-03 20:16:11 +01:00
e608a16edf
Tank Transfer Valves won't pester the admins if the volume of the two tanks are equivilent before they are mixed. 99999/100000 times this means that the tank was already opened once and fouled, and the remaining 1/100000 the toxins guy was AMAZINGLY crap at his job.
2015-06-01 23:11:42 -04:00
e3b92f0caf
Merge pull request #9656 from bear1ake/pda-id-drop-fix-2
...
Fix for #4219 . Variant 2
2015-05-31 14:35:00 -05:00
426fa3c18d
Merge pull request #9680 from kingofkosmos/healthscannerchanges
...
Health analyzer output reordering
2015-05-31 14:12:09 -05:00
0588647ba4
Switched up the order of shown damages.
2015-05-30 11:37:22 +03:00
662af7174f
Merge remote-tracking branch 'upstream/master' into fixfixfix
...
Conflicts:
icons/obj/storage.dmi
2015-05-29 21:45:18 +01:00
361693d7f8
Reordered stuff.
2015-05-28 20:48:23 +03:00
a90fc31df1
Medical scanner output changes. Rounding, capitalization, grammar etc.
...
Minor changes to gas scanner output.
2015-05-26 21:44:32 +03:00
c4254a727d
Merge pull request #9638 from CosmicScientist/EnglishFixes
...
Fixed some general spelling and grammar
2015-05-26 03:53:37 -05:00
8122ddc94f
Delete ID's when PDA destroys.
2015-05-26 17:01:00 +09:00
fb2beca318
Merge pull request #9602 from Aranclanos/AItracking
...
Fixes all possible exploits with the AI tracking href link
2015-05-24 23:26:31 -05:00
a94075d07d
Edited pAIcard displayed message, donksoft dart description and some tips of the round.
2015-05-24 20:49:06 +01:00
Ikarrus
phil235
Cheridan
xxalpha
Iamgoofball
Razharas
Remie Richards
Xhuis
Jordie0608
GunHog
kingofkosmos
Miauw
AnturK
Incoming
Carl Ivanov
CosmicScientist