f1b55e706d
Ported New Hairs from NTS
...
-A collection of new hairs from NTS
-Organized new hairs into the list instead of putting them all on the bottom
-Removes gendered head hair (Facial hair is still gendered)
-Tones down the severity of contrast for lighter hair colors
2014-04-24 21:12:08 -06:00
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
4d8160ab14
meteorhit() is kill
2014-04-22 12:16:02 -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
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
434eee790e
Fixes #3351
2014-04-21 12:42:26 +03: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
80e7d1d0e7
Added a check for "_nodrop_" items for several machines/structures ( fix #3407 ).
2014-04-20 20:49:32 +02: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
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
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
f302adc8ab
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
2014-04-16 16:58:28 -07:00
d96c418371
returns a sanitized string on the stars() proc
2014-04-15 20:23:20 -03: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
71cd05cf49
Merge pull request #3393 from Razharas/GrabPull
...
Added datum mutations
2014-04-15 10:27:31 -05:00
81a3617dc3
Added monkey/can_equip proc.
...
See, isn't that much nicer?
2014-04-14 15:26:51 -05:00
74256bc302
Quick fix on can_equip.
...
I realized I forgot about the warning messages.
2014-04-14 15:22:47 -05:00
a2fa25012b
Made human-specific can_equip proc.
...
This code is still a mess, but it probably can't be helped short of rewriting inventory code with standardized slot numbers and such.
2014-04-14 15:19:48 -05:00
9f0f60204a
Added can_equip proc for polymorphism.
2014-04-14 14:59:58 -05:00
9280e1410f
Fixes cyborgs spawning as ghosts.
2014-04-13 13:04:36 +01:00
a250e5f670
More !!FUN!!
...
Im open to discussion as to remove some of the TOO op mutations
2014-04-13 00:04:41 +04:00
16ae0d9f0d
Fixed the lazy "fix" which caused mobs that Login or Logout to lose their hotkey mode; even when they transfer to another mob.
2014-04-12 20:49:56 +01:00
84bb0f338c
Removes the extra dark vision of lizards
2014-04-11 21:18:49 -03:00
2da47fbb79
Adds mutant races to the character preferences. It can only choose between lizard and human right now.
...
Adds a new server configuration to toggle on and off the mutant races preferences. If it's off, everyone will be human.
2014-04-11 21:10:27 -03:00
3cf9c105f9
what is the cutest monster girl and why is it harpies
2014-04-10 15:32:32 -05:00
d783bccb6e
Merge pull request #3383 from MrPerson/qdel_spells_TAKE_TWO
...
Make reenter-corpse not delete your spells
2014-04-10 21:55:17 +02:00
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
ikarrus
fleure
Cheridan
phil235
Miauw
Firecage
Nerolat
Niknakflak
Giacomand
Menshin
MrPerson
AndroidSFV
Razharas
Aranclanos
Ergovisavi
Nnelg
Razharas
Jordie0608