tkdrg
153304ddc8
Merge pull request #14165 from SouDescolado/SouDescolado-patch-1
...
Stacks the papers inside a folder inside briefcase
2015-12-31 16:07:24 -03:00
KorPhaeron
7fd33d23a5
Meat spike
2015-12-31 12:50:05 -06:00
tkdrg
f64392a8cd
Merge pull request #14166 from KorPhaeron/ghosts
...
Fixes offer control to ghosts not working on mindless mobs
2015-12-31 15:07:58 -03:00
KorPhaeron
efc4df456e
Poor indent
2015-12-31 11:37:51 -06:00
Nerd Lord
8996b7c71e
Strong independent carp that don't get pushed around.
2015-12-31 12:31:28 -05:00
KorPhaeron
9c8a0cb0a5
Implant
2015-12-31 10:47:33 -06:00
MrStonedOne
ba660d98ba
Some minor ghost popup fixes
2015-12-31 02:23:53 -08:00
MrStonedOne
69a70daebd
Ghost popup part 2: The didn't do much-a-ning
...
Fixes button3, does the remie
2015-12-31 01:54:15 -08:00
KorPhaeron
52248a6875
Icon
2015-12-31 01:55:40 -06:00
Tkdrg
3b1553cb8c
Fixes create revolutionares bugs
...
Fixes create revolutionares feedback message
Fixes creating revs on z levels other than 1
Fixes #14189
Fixes #14161
2015-12-31 04:19:32 -03:00
tkdrg
ff57d7e485
Merge pull request #14163 from swankcookie/Holopad_Layer_Fix
...
Holopad layer fix
2015-12-31 03:41:55 -03:00
tkdrg
52a45b6292
Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework
...
OBJECTIVES REWORK: Better Objectives Generation
2015-12-31 03:11:41 -03:00
Nerd Lord
071cb63930
fine okay no helper
2015-12-30 23:32:58 -05:00
KorPhaeron
bb8af2785e
Guardian Naming
2015-12-30 22:23:33 -06:00
Nerd Lord
96f1ec92b0
ACTION CONFLICTING
2015-12-30 23:14:32 -05:00
Kyle Spier-Swenson
167324d5dc
Forgot to remove a tab when I combined nested ifs
2015-12-30 20:05:57 -08:00
Buggy123
44879bceb1
Added small explosion as suggested
2015-12-30 23:05:26 -05:00
Kyle Spier-Swenson
6ec763e655
forgot a )
2015-12-30 19:59:18 -08:00
Kyle Spier-Swenson
f859536aa9
do_after and company will no longer break on spacemove
...
So I was looking into atom/movable/Move() being high up on the profile when I stumbled upon inertia_dir and had ideas.
Everything is SUPPOSE to set this to 0 when they stop space moving. I'm just gonna trust that to be the case (it is in base atom/movable/newtonian_move.
I don't want to keep calling Process_Spacemove in the loop because that feels dirty.
2015-12-30 19:55:27 -08:00
tkdrg
da97c0fb58
Merge pull request #14107 from LanCartwright/newvirogrenades
...
Viro-terror grenade renovation
2015-12-31 00:04:38 -03:00
tkdrg
4485cc3dfb
Merge pull request #14146 from KorPhaeron/guns
...
Lesser Summon Guns
2015-12-30 23:32:13 -03:00
tkdrg
50f6b7b8c0
Merge pull request #14154 from KorPhaeron/telsa
...
Removes excess tesla balls from orbit list
2015-12-30 23:27:58 -03:00
tkdrg
b381ff2b31
Merge pull request #14132 from KorPhaeron/pda_spaces
...
Fixes PDA formatting
2015-12-30 23:27:28 -03:00
LanCartwright
f9aa12d190
excludes virus kits from nuke
2015-12-31 02:22:51 +00:00
LanCartwright
023f606406
Update uplink_item.dm
2015-12-31 02:20:35 +00:00
LanCartwright
02dc51db6f
Update uplink_kits.dm
2015-12-31 02:17:30 +00:00
KorPhaeron
d969d4442e
Revert "Multiverse clones are now identical to the summoner"
2015-12-30 20:13:55 -06:00
LanCartwright
fa2276fca6
fixes random tab
...
actually I hit tab instead of space
2015-12-31 02:13:36 +00:00
KorPhaeron
ff5767d785
Nevermind
2015-12-30 20:12:40 -06:00
LanCartwright
afadb0bbec
typo
2015-12-31 02:12:18 +00:00
KorPhaeron
504926883f
Cleans up code
2015-12-30 20:10:15 -06:00
LanCartwright
3e10ee04f6
god dammit
2015-12-31 01:54:49 +00:00
Incoming
84fc69d825
Removes gender restrictions from socks.
2015-12-30 20:53:40 -05:00
KorPhaeron
4b78a51361
Wrong place
2015-12-30 19:44:22 -06:00
KorPhaeron
9499d35c6b
Diety name
2015-12-30 19:39:35 -06:00
tkdrg
51a28ab055
Merge pull request #14159 from somnium13/fix-in-prec
...
Fixes 'in' operator precedence issues.
2015-12-30 22:38:13 -03:00
tkdrg
213cebe1d6
Merge pull request #14153 from KorPhaeron/capsule
...
Fixes bluespace shelters destroying shuttles
2015-12-30 22:36:48 -03:00
KorPhaeron
1fee3c83a6
Span classes
2015-12-30 19:12:56 -06:00
KorPhaeron
79e5f3d37e
Check that actually works
2015-12-30 19:10:49 -06:00
KorPhaeron
943ce2ff95
Shuttle Delay
2015-12-30 18:49:01 -06:00
bgobandit
470fcbc58f
Fixes messages for grabbing someone who is buckled in.
2015-12-30 19:17:51 -05:00
WJohn
7e2daf6c23
Merge pull request #14156 from Anonus/newbooks
...
Replaces every single book sprite with better sprites
2015-12-30 18:31:31 -05:00
Akke
11a3cb3d82
indentation
2015-12-30 23:30:55 +00:00
Buggy123
b7ca0abc55
Finally
2015-12-30 17:58:48 -05:00
Buggy123
f8e0180e3f
I'm bad at this
2015-12-30 17:57:56 -05:00
Buggy123
8980c681f2
I'm trying
2015-12-30 17:52:06 -05:00
AnturK
65bcef04ea
makes manifest entries use get_flat_human_icon
2015-12-30 23:47:37 +01:00
Buggy123
e15474bcc0
Stay with me here
2015-12-30 17:43:28 -05:00
duncathan salt
f09025abf9
Merge pull request #13983 from PKPenguin321/arm-mods
...
Adds Arm-Mods (Mounted Taser & Mounted Laser)
2015-12-30 23:37:01 +01:00
Buggy123
6227456c57
Reverted for real this time
2015-12-30 17:36:35 -05:00