6807b1ae48
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
c4f96685b3
* Sprite fixes
2015-04-16 12:17:55 +02:00
1c5c0afc41
* SPRITES!
2015-04-16 12:17:54 +02:00
bc71b4b8b3
* Fixes observers not seeing abductor hivemind
...
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
4c1a1c8c87
Merge pull request #8967 from phil235/BundleFix1
...
A big bundle of fixes
2015-04-16 18:18:53 +10:00
210eedbb48
Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
...
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10:00
87edea4eab
Merge pull request #8969 from phil235/BundleFix2
...
Another bundle of fixes
2015-04-15 21:08:13 -05:00
029b2550f5
Makes it slightly harder for a medibot to get stuck.
2015-04-15 11:15:01 -05:00
bcb6331dbf
Merge remote-tracking branch 'remotes/origin/Of_Bots_And_Logic' into Bot_Radio_And_Newscasters
2015-04-15 09:54:20 -05:00
36cac2405d
Merge pull request #8932 from Iamgoofball/patch-56
...
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
f4aa06af22
Merge pull request #8972 from MrStonedOne/patch-5
...
Fixes runtime when clientless mobs change areas
2015-04-15 13:02:53 +02:00
6c1117c14d
Merge pull request #8958 from Incoming5643/excuse_me_while_I_vent_a_bit
...
buffs head slugs a bit
2015-04-15 13:01:58 +02:00
26a974a8c3
Merge pull request #8943 from MrPerson/ied_fixes
...
IED fixes
2015-04-14 19:40:50 -05:00
d5318a033b
Merge pull request #8933 from Cheridan/snackbar
...
New barsign!
2015-04-15 00:33:18 +02:00
5075909757
More bug fixes
2015-04-14 14:23:30 -04:00
71c07dd0e5
Fixes runtime when clientless mobs change areas
2015-04-14 10:41:12 -07:00
2ed906b990
Fixes inhand sprites for eggs.
...
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
0f6a60600d
Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
...
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +02:00
081bae6740
Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
...
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
68849b9c8e
Adds ling control to the head slug
...
Adds a changelog!
2015-04-13 21:44:54 -04:00
21e8564210
One more define
2015-04-13 21:15:14 -04:00
f6c8b3bfc5
Replaces fonts with spans, adds defines
2015-04-13 19:42:50 -04:00
f6011468db
Removes unnecessary colon
2015-04-13 19:14:05 -04:00
87541dabc2
Progress
2015-04-13 19:12:29 -04:00
7b5760f6d3
Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1
2015-04-13 16:47:00 -04:00
9c752683ef
Shadowling update one
2015-04-13 16:46:49 -04:00
a98eee4fa8
here we gop
2015-04-13 12:01:38 -07:00
63504f7a67
whoops
2015-04-13 12:01:09 -07:00
11603451df
Merge pull request #8577 from Iamgoofball/spin
...
CRITICAL LAG FIX FOR SINGULARITIES AND THROWING
2015-04-13 20:39:08 +02:00
1ffb753acf
reverts infinite spin
2015-04-13 11:27:34 -07:00
b17e2d07fd
Update atoms.dm
2015-04-13 11:26:49 -07:00
3c4b25902c
Update atoms_movable.dm
2015-04-13 11:25:37 -07:00
cd0d79d757
fix part 1
2015-04-13 11:25:19 -07:00
6fa8e5f02d
Adds Abduction Mode
2015-04-13 18:40:15 +02:00
0a6fb70137
IED fixes
...
Fixes #8919 - can pixel_x/pixel_y is inherited by the IED after construction
Fixes an unreported issue where the can underlay of IED's would be rendered underneath your HUD when it was in your hands.
2015-04-13 07:00:19 -07:00
77cd7476a1
Merge pull request #8872 from optimumtact/patch-1
...
Fix electronics check in airlock code
2015-04-13 18:25:05 +10:00
d780855688
Merge pull request #8908 from Ikarrus/sprayequip
...
Removes spraycan equipping message and moves their priority down
2015-04-13 18:24:46 +10:00
99d545d185
Merge pull request #8891 from Incoming5643/logic_who_needs_that
...
Fixes a few unreported logic goofs in my newest mulligan pull
2015-04-13 18:24:02 +10:00
86f5b381a3
Merge pull request #8884 from Incoming5643/Ooo_whatcha_say
...
adds speak emote to a lot of simple animals that lacked them
2015-04-13 18:23:51 +10:00
d8ef9ecb44
Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
...
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
e6143f6493
Merge pull request #8810 from AnturK/everybodywaskungfufighting
...
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
becdb6fcc3
Merge pull request #8746 from ACCount12/diseasesfixes
...
Fixes for DNA spread and transformation diseases
2015-04-13 18:22:21 +10:00
ae120db87c
Merge pull request #8728 from AnturK/action_button
...
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
0dd03a7201
you didn't see anything
2015-04-12 19:13:24 -07:00
729be13486
New barsign!
...
In honor of https://www.reddit.com/r/SS13/comments/322cm1/ss13_confirmed_isis_recruitment_shill/
We need more subliminal messages to appease our ISIS overlords
2015-04-12 21:00:24 -05:00
18207ae363
Fixes incendiary grenades
2015-04-12 18:02:22 -07:00
141d577bba
Merge pull request #8895 from phil235/WindowFix
...
Windows, CPR, lipstick fixes
2015-04-12 13:06:42 -05:00
8bbad98700
Merge pull request #8920 from Xhuis/raceFix
...
Fixes being able to spawn with Thrall race (by removing it)
2015-04-12 18:17:40 +02:00
2005e8da66
Fixes Human? in the spawn races tab
2015-04-12 12:15:08 -04:00
ffd0db2b7b
Merge pull request #8581 from MrPerson/lighting_2015
...
Object based lighting system
2015-04-12 13:14:32 +02:00
phil235