579b705f24
Merge pull request #3492 from Firecage/master
...
Roboticist on Preference screen Fixes #1145
2014-04-23 16:44:11 +01:00
7539e59679
Merge pull request #3497 from phil235/AlienMonkeyAtkMsgFix
...
Partial fix for #1344
2014-04-23 15:16:56 +01:00
4a0d59e81c
Merge pull request #3485 from Nerolat/cyborgcult
...
Doesn't announce that a player was de-culted or de-reved after making them a silicon. Fixes #3351
2014-04-23 15:09:47 +01:00
7d9e758c9f
Merge pull request #3467 from MrPerson/grabby_patties
...
Make grabs GC, fix a grab related runtime
2014-04-23 14:57:02 +01:00
e12a567000
Merge pull request #3484 from VistaPOWA/pr_announce_security
...
Security fixes for PR announcer
2014-04-22 15:17:07 -07:00
df8b266d38
Merge pull request #3445 from Incoming5643/magicmania1.6
...
Magic Mania 1.6: Baby's Day Out
2014-04-21 22:30:34 -05:00
fd62e88d6f
Merge pull request #3448 from Ikarrus/lingchatlog
...
[Admin] Added logging for changeling hivemind chat
2014-04-21 21:55:19 -05:00
be8671fcf9
Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.6
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-04-21 19:00:04 -04:00
d12238db57
adding missing comma
2014-04-21 22:01:20 +02:00
0a4cc4a35e
Monkey third party attack no longer bolded
2014-04-21 21:33:53 +02:00
fccf892445
Alien third party attack no longer bolded.
2014-04-21 21:30:41 +02:00
4539711d9a
Merge pull request #3459 from MrPerson/screen_deletion
...
Remove some unnecessary code of mine that's causing runtimes
2014-04-21 13:26:49 -05:00
0a1c77964d
Merge pull request #3469 from phil235/HornStunFix
...
weapons with force below 5 now have no chance to knock down
2014-04-21 12:58:29 -05:00
1450960ad7
Merge pull request #3462 from Niknakflak/AIdeathcore
...
AIs. New cores, death cores.
2014-04-21 12:56:04 -05:00
658c753989
Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"
...
This reverts commit f2d850ee25805e2570bf
2014-04-21 18:59:58 +02:00
7577faff05
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
2014-04-21 18:57:56 +02:00
6610b1677a
Signed-off-by: Firecage <firecage@hotmail.com>
2014-04-21 18:54:44 +02:00
f2d850ee25
Merge pull request #3218 from AndroidSFV/aiphotoext2
...
AI Photography Extention #2
2014-04-21 18:18:16 +02:00
46ac3c15f5
can't knock down if aiming at head.
2014-04-21 18:05:14 +02:00
0ecf8a5d9e
Merge pull request #3465 from Giacom/pandemic_fix
...
Ports a Pandemic machine fix
2014-04-21 10:18:19 -05:00
434eee790e
Fixes #3351
2014-04-21 12:42:26 +03:00
9c3f31d86b
Security fixes for PR announcer
...
Thanks @Giacom for the info!
PR announcer is now able to authenticate with Nickserv.
Communications key moved out of config controller.
Even better Regex validation.
Reading now has even more exception handling.
2014-04-21 10:51:04 +02:00
753979a915
Merge pull request #3458 from Firecage/master
...
Some stuff about the mime backpack.
2014-04-20 23:06:10 -05:00
3cdcc2e10f
edited
2014-04-20 20:59:17 -07:00
18a075a14e
Fixes hotkey mode always being set during login. winget() was returning "true", not 1 or 0. It now compares for the string.
2014-04-21 00:40:23 +01:00
92446f2384
weapons with force below 5 can't knock down
2014-04-20 20:28:27 +02:00
61f3fabb59
force 0 weapons now have no chance to knock down
...
fixes #3414 where the bikehorn had a 10% chance of knocking down someone when aiming at the chest
2014-04-20 20:01:18 +02:00
830c63fcf5
Make grabs GC, fix a grab related runtime
...
The following runtime has occured 104 time(s).
runtime error: Cannot execute null.s click().
proc name: Click (/obj/screen/grab/Click)
source file: screen_objects.dm,73
usr: Reece Eliza (/mob/living/carbon/human)
src: the reinforce grab (/obj/screen/grab)
2014-04-20 09:14:16 -07:00
b250f3ad55
Merge pull request #3453 from Menshin/Sun_and_solars
...
Sun and solars
2014-04-20 09:11:50 -05:00
7c297c4262
Ports Pandemic machine fix from https://github.com/NTStation/NTstation13/pull/469
2014-04-20 11:13:43 +01:00
b5b17882b0
Does a lot of stuff
2014-04-20 01:42:52 -07:00
b8be6cea71
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
2014-04-20 09:30:16 +02:00
8a7c3dc9a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into aiphotoext2
...
Conflicts:
code/game/machinery/newscaster.dm
2014-04-20 01:30:44 -05:00
a2895ed9dc
Merge pull request #3446 from Aranclanos/LindaChecks
...
Admin status panel, extra air thingies
2014-04-19 19:04:49 -07:00
5e92f3acfe
Remove some buggy ass, unnecessary code of mine that's causing runtimes
2014-04-19 12:56:43 -07:00
dff7ebc0a4
Signed-off-by: Firecage <firecage@hotmail.com>
2014-04-19 21:42:31 +02:00
7cb4f4141e
Merge pull request #3450 from Razharas/VineFix
...
Fixing instagib vine
2014-04-19 14:31:11 -05:00
0fda25c757
* sun and solars now uses world.time instead of timeofday,
...
* the solar panels are now rotated instantly instead of slowly do it every tick,
* code cleaning
2014-04-19 18:31:22 +02:00
7347b1bebd
* tweaked the solar update method to be more accurate
...
* added a check for the midnight rollover of timeofday
* the manual tracking orientation is now synchronized with the sun position update
* now checking if the solar panel/tracker/computer is not already in the solars_list before adding it
* added a message noticing the beginning of a solar panel/tracker deconstruction
* tweaked the manual tracking for better accuracy : the orientation is increased/decrease internally and updated altogether the sun.
2014-04-19 13:06:27 +02:00
8f6897964c
Merge pull request #3418 from VistaPOWA/pr_announce
...
[CONFIG][BACKEND] Adds PR announcing to the game.
2014-04-18 19:05:44 -07:00
37cb6f9220
AHJGFD
2014-04-18 19:48:32 +04:00
d536671fd7
Fixing instagib vine
...
>Lower severity means higher damage
>Intuition
>Logic
>Sanity
2014-04-18 19:24:08 +04:00
14fe3bc29a
[Admin] Added logging for changeling hivemind chat
...
Also added their Changeling names to the Antag panel so admins don't have to go digging through vars to find out who was OOC in ICing.
2014-04-17 21:23:11 -06:00
ca67aeb3aa
Added more stuff to the status panel for admins, air related, these are only temporal (hehehe)
2014-04-17 21:37:06 -03:00
c83728bba1
Magic Mania 1.6: Baby's Day Out
...
*Adds unique sprites for the staves of door creation and chaos
**Item sprites
**Inhands
**Onbacks
*Fixes #3232 in a way that isn't terrible
*Basically this is the part of 1.5 that should have been done back when it was added
*Please raise wizard rates :3
2014-04-17 19:35:42 -04:00
896414bcc4
Increased cost of gygax, decreased cost of durand, capped protolathe coeff at 2x
2014-04-16 20:09:54 -07:00
f302adc8ab
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
2014-04-16 16:58:28 -07:00
b8e6e61dec
Merge pull request #3426 from RandomMarine/theteargasitburns
...
Removes HEADCOVERSEYES from caps
2014-04-15 23:42:56 -05:00
4c66f666cb
Merge pull request #3425 from Giacom/fix_magboots
...
Fixed magboots requiring to be turned on and off to correctly set NOSLIP...
2014-04-15 14:09:10 -05:00
75919440d6
Merge pull request #3412 from Giacom/someone_was_lazy
...
Fixed the lazy "fix" which caused mobs that Login or Logout to lose their hotkey mode.
2014-04-15 11:24:07 -05:00
fleure
MrPerson
Cheridan
Incoming
phil235
Miauw
Firecage
Nerolat
VistaPOWA
Niknakflak
Giacomand
AndroidSFV
Razharas
Menshin
Razharas
ikarrus
Aranclanos
Ergovisavi