31a89ff320
Makes inquisitiveness client preference
2015-12-21 17:28:36 +01:00
b7c0d8cbb3
Merge pull request #13836 from KorPhaeron/mounted_chainsaws
...
Fixes mounted chainsaw deletion
2015-12-21 09:18:16 -06:00
ef415278aa
Merge pull request #13830 from Incoming5643/nothing_ever_works_right_away_its_just_the_way_things_are
...
Unbricks the rpgloot event
2015-12-21 12:14:36 -03:00
71d8a929a4
My stealth buff was defeated by code review
2015-12-21 09:08:26 -06:00
c805331bdf
Fixes nest layer
2015-12-21 08:57:18 -06:00
fac3665f0f
Infinite skeletons
2015-12-21 08:54:34 -06:00
7154edb16a
Merge pull request #13838 from KorPhaeron/stealth_weapons
...
Screwdriver attack animation fix
2015-12-21 08:50:10 -06:00
82ad4b218d
Shadowlings space hatch
2015-12-21 08:31:17 -06:00
942fcacb9a
holopad fix
2015-12-21 08:17:34 -06:00
5821dd81ad
we dont have a shotgun tree you know
2015-12-21 13:37:31 +00:00
03ead46f44
Slaughter Demon Devour
2015-12-21 07:24:02 -06:00
202230072d
Away Missions
2015-12-21 07:12:30 -06:00
23cd403fca
Removes pointless toggle fire button
2015-12-21 07:07:27 -06:00
e988bc0a2a
Slimes
2015-12-21 06:42:44 -06:00
d3d582f0cb
Merge pull request #13821 from KorPhaeron/hog
...
Godstaff Fix
2015-12-21 13:41:22 +01:00
61ae415ae0
fixes missing "
2015-12-21 12:38:40 +00:00
a50c161393
Merge pull request #13780 from tkdrg/CHE_RI_DAAAAN
...
Finally fixes special completion for real
2015-12-21 13:37:06 +01:00
161e6ea5c1
Merge branch 'plasmaknucklesandwich' of https://github.com/LanCartwright/-tg-station into plasmaknucklesandwich
2015-12-21 12:32:04 +00:00
9bb1585b59
adds wrestling data
2015-12-21 12:31:30 +00:00
7200c74d90
Fixes various ghost replacement things
2015-12-21 02:43:42 -06:00
2edfd114bd
Span class
2015-12-21 02:20:40 -06:00
2aac9a2b1c
SM shard logging
2015-12-21 00:25:25 -06:00
96855b3094
Merge pull request #13800 from KorPhaeron/voices
...
Prayer response voice is generalized again
2015-12-21 03:16:31 -03:00
adc2fa3b03
Fixes Turrets
2015-12-21 00:12:17 -06:00
72a5c2d604
why am I editing in the browser this is terrible
2015-12-21 01:11:29 -05:00
cda01d1457
he's right
2015-12-21 01:10:37 -05:00
c773277123
Fixes human tail wagging not being endable because human tails were done in a somewhat cruddy way and I didn't notice.
2015-12-20 23:42:45 -05:00
9fe6d2bfce
Merge pull request #13827 from The-Albinobigfoot/master
...
Flops can buy no-slips again.
2015-12-21 01:29:38 -03:00
0c53fc91d2
Fixes Synchronous Mesh not syncing damage 100% accurately, adds CLONE as a damage type blobs can take damage from(likely to be entirely internal, as I'm pretty sure the crew can't hit the blob with clone damage)
2015-12-20 22:52:00 -05:00
4e964429c0
Speeds up DEVICE_TYPE_LOOP
2015-12-21 02:06:38 +00:00
c00e773b6d
Merge pull request #13818 from LanCartwright/nukeopsrenovation
...
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
ba18bebf48
missed this one
2015-12-21 00:40:20 +00:00
7d5f21259d
Changes c90gl to m90gl
2015-12-21 00:30:55 +00:00
2c9dd75137
Across the board nerfs for plasmic fusion, as well as hopefully fixing the transfer bugs.
2015-12-20 19:18:19 -05:00
39e7e7f5ba
Update martial.dm
2015-12-21 00:12:36 +00:00
52d66c40a7
Merge pull request #13803 from KorPhaeron/sproink
...
Accelerator Rounds for sniper rifle
2015-12-20 20:58:21 -03:00
c2c57f8e1f
Objects created by the staff of animation eventually revert to just being normal objects in the absence of anyone to attack.
2015-12-20 18:55:20 -05:00
c5106537ef
Merge pull request #13801 from bgobandit/hohohogod
...
Adds Christmas-related suicide messages.
2015-12-20 20:49:32 -03:00
181417723e
Merge pull request #13816 from AnturK/bottopicfix
...
Fixes Bot topic checks
2015-12-20 20:45:49 -03:00
da324e7661
nyet cyka russian mumbles
2015-12-20 23:25:06 +00:00
ad206b472e
Changes Synchronous Mesh to split damage between blobs, but take more overall damage from things like bombs and fire.
2015-12-20 18:21:25 -05:00
38c6af7032
Improves the speed of the for()loops in the maploader procs, Removes assumptions that the coordinates exist (NO MORE RUNTIMES AT MAP EDGES WOOO!)
2015-12-20 22:46:25 +00:00
2f312c3616
Adds three new blob reagents;
...
Replicating Foam, which is brown, does brute damage, has bonus expansion, and has a chance to expand when damaged.
Sporing Pods, which is light orange, does low toxin damage, and has a chance to produce weak spores when expanding or killed.
Synchronous Mesh, which is teal, does either brute or burn damage, and does bonus damage for each blob tile near the target.
2015-12-20 17:01:53 -05:00
8d586cef49
Adds a bottle of drying agent spray to janiborg.
2015-12-20 21:57:43 +00:00
37a7699bc9
Harm intent only
2015-12-20 15:28:29 -06:00
a0923daa0e
Removes NOSHIELD
2015-12-20 15:21:58 -06:00
5f257aa8fe
Admins with +DEBUG can now Load map files in the _map/templates folder where they (or their ghost) is standing.
2015-12-20 21:21:33 +00:00
b8bdc8fce3
merge error
2015-12-20 21:04:54 +00:00
986bfc8501
merge error
2015-12-20 21:04:09 +00:00
12206ae324
Merge branch 'nukeopsrenovation' of https://github.com/LanCartwright/-tg-station into nukeopsrenovation
...
# Conflicts:
# code/game/objects/items/weapons/storage/backpack.dm
2015-12-20 21:02:08 +00:00
AnturK
Cheridan
tkdrg
KorPhaeron
KorPhaeron
Akke
phil235
Incoming5643
Incoming
Nerd Lord
Remie Richards
as334
xxalpha