ccf7e02f2c
Merge pull request #9909 from Iamgoofball/patch-79
...
"IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
2015-06-13 04:15:04 +03:00
d2ef043690
Resolved Conflicts:
...
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
351fa89c3a
- Renamed tommy guns and made them w_class 5. They're powerful as hell, so they're going to have to be non-concealable. (+3 squashed commit)
...
Squashed commit:
[acab7ea] - Gang messages distinct between bosses and lieutenants.
- Initial gang points reduced to 25 so they can't buy a pen right away
[140e599] 20 -> 10
[b03fbba] Bulletproof vest + Bugfixes (+1 squashed commits)
Squashed commits:
[b03fbba] Bulletproof vest + Bugfixes
2015-06-11 23:42:08 -06:00
532d992b02
"IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
...
famous last words
merge asap
2015-06-11 16:07:22 -07:00
7363088cbc
Merge pull request #9802 from Miauw62/AyeEye
...
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
cc05c8f206
Makes AI tracking work. OO-ifies trackability.
2015-06-11 19:33:19 +02:00
96f14d49bf
Merge pull request #9806 from kingofkosmos/blendershake
...
Blender, food processor and gibber shaking when processing.
2015-06-11 10:58:38 -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
debb7da66b
Merge pull request #9588 from AnturK/build_area
...
Adds map generators to build mode
2015-06-11 12:50:20 +01:00
59d9098d26
Gang Update
2015-06-10 23:05:58 -06:00
4ce96c52ef
Merge pull request #9875 from Iamgoofball/logs
...
Adds feedback gathering for a hell of a lot more things.
2015-06-11 07:30:57 +03:00
b3733df367
logs item attacking
2015-06-10 18:00:45 -07:00
a58cebbcce
fixes problems
2015-06-10 17:33:35 -07:00
6b83b0aa8f
Merge pull request #9360 from xxalpha/aifixmaybe
...
Fixed AI seeing more than it should when the Eye is moved to the Core.
2015-06-11 03:08:20 +03:00
6f624b79df
Merge pull request #9139 from Xhuis/pray_4_fun
...
Adds prayer sounds to admins + prioritizes chaplain prayers
2015-06-11 02:58:46 +03:00
0dc52a4bc5
Merge pull request #9861 from MrStonedOne/patch-16
...
fixes readmin when username had upper case letters
2015-06-11 02:27:26 +03:00
7a952b9310
Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake
...
Conflicts:
code/modules/food&drinks/kitchen machinery/gibber.dm
code/modules/food&drinks/kitchen machinery/processor.dm
2015-06-10 20:48:22 +03:00
0933012ff6
Combined the two offset-lines into one line.
2015-06-10 19:43:45 +03:00
607ed1cbb8
Made all shakeys shake around themselves instead of shaking only to the right. Added shaking to blender's juicing process. Simplified the return-to-its-normal-spot line.
2015-06-10 19:43:44 +03:00
292c14eafb
Made shaking faster. Added shaking to monkey recycler. Added juicer.ogg to the gibber.
2015-06-10 19:43:44 +03:00
06e98a1e86
Blender, food processor and gibber shaking when processing.
2015-06-10 19:43:44 +03:00
33e2991011
Merge pull request #9712 from Firecage/deadspiderwebbing
...
Makes the giant spider verbs not work if dead.
2015-06-10 10:34:20 -05:00
a34641bb6f
Makes AI in-progress tracks not cancel if the AI moves.
2015-06-10 17:14:22 +02:00
f992eb1af0
Adds feedback gathering for a hell of a lot more things.
2015-06-09 21:52:46 -07:00
b873176a77
Merge pull request #9821 from Cheridan/just_cuff_my_shit_up
...
REMOVES CABLE CUFFS...
2015-06-10 01:17:35 +03:00
4f495f1d93
Merge pull request #9833 from Iamgoofball/patch-75
...
Adds trekchems to the Mediborgs.
2015-06-09 16:27:32 -05:00
8fa07d303c
Merge pull request #9820 from Cheridan/arbitrary_powerdrain
...
Removes Cyborg Per-Active Module Powerdrain
2015-06-10 00:21:50 +03:00
d14fec2f4f
Merge pull request #9827 from BananaCreamPie/spooctacular
...
Adds several sprites for ghostform
2015-06-09 15:17:17 -05:00
ff5c9d3f5b
fixes readmin when username had upper case letters
...
fixes #9775
2015-06-09 01:18:22 -07:00
937519ffde
Merge pull request #9843 from Aranclanos/Babyrage
...
Shuttle fix
2015-06-09 08:49:29 +03:00
47a02231f1
Merge pull request #9813 from Iamgoofball/constructionjunctionwhatsyourfunction
...
Upgrade Update: Bluespace Boogaloo
2015-06-09 08:48:51 +03:00
81fcaa9344
PSHOOM
2015-06-08 20:38:50 -07:00
10c60a59b1
adds beam sprites @cheridan merge when???
2015-06-08 19:56:06 -07:00
d7e3363129
Merge pull request #9817 from xxalpha/dropfixes
...
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
b5fc2ca46b
committed balance ideas and NEW SPRITE FROM WJ
2015-06-08 19:01:43 -07:00
9919e6a0cf
INTRODUCING THE BLUESPACE RPED
2015-06-08 17:07:19 -07:00
f34b45b7b8
Fixes shuttles taking turfs that aren't part of the shuttle itself.
...
Fixes shuttles breaking apart if the turfs aren't strictly shuttle turfs (who are also gone in a previous commit, now under wall and floors paths)
Fixes #9722
Fixes #6856
Fixes #9788
2015-06-08 05:07:02 -03:00
29c2bb474d
Merge pull request #9804 from Firecage/Exwelder
...
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
e55c94c757
Merge pull request #9814 from Incoming5643/nothing_from_nothing_leaves_something
...
Fixes a runtime with dangerous_existence
2015-06-07 21:15:53 -05:00
2a0595b015
Merge pull request #9823 from SvartaSvansen/detach-from-kill
...
Fixes mob aggression. Just a patch.
2015-06-07 21:10:39 -05:00
25c3832671
Adds trekchems to the Mediborgs.
2015-06-07 04:52:55 -07:00
bca9c627ee
Merge pull request #9767 from Iamgoofball/patch-71
...
Re-adds kekchems
2015-06-07 12:38:33 +01:00
988ff28734
adds panel open icons for the new buildables
2015-06-07 03:55:28 -07:00
d35c55dffd
Adds several sprites for ghostform
2015-06-07 03:31:40 -04:00
0e28326097
Merge pull request #9779 from Cheridan/touching_linda
...
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
a9c25caef3
forgot the new admin debug verb
2015-06-06 18:50:14 -07:00
8aa79e1f1c
fixes and changes
2015-06-06 18:40:38 -07:00
5d8ee84f12
Fixes mob aggression. Just a patch.
2015-06-06 21:26:09 -04:00
46acc2a55d
REMOVES CABLE CUFF
2015-06-06 16:21:41 -05:00
2ffbd75e08
whoops
2015-06-06 14:17:25 -07:00
Razharas
Ikarrus
Iamgoofball
Cheridan
Miauw
Remie Richards
kingofkosmos
MrStonedOne
Aranclanos
bananacreampie
SvartaSvansen
Cheridan