3a910f164e
Merge pull request #13858 from Anonus/repliblob
...
Adds three new blob chemicals
2015-12-21 20:05:18 -03:00
ae4d8cc7d0
it doesn't do anything but sure okay
2015-12-21 17:56:06 -05:00
d8cd0638d8
Merge pull request #13823 from Xhuis/misc_fixes
...
Stun batons respect shields on hit
2015-12-21 19:43:12 -03:00
bbe96caee1
Merge pull request #13785 from KorPhaeron/we_dune_now
...
Eshields have 100% block vs energy ,but 0 vs everything else
2015-12-21 19:42:52 -03:00
a08afebf02
Merge pull request #13857 from xxalpha/drycleaning
...
Adds a bottle of drying agent spray to janiborg.
2015-12-21 19:39:13 -03:00
0397ce0b54
Merge pull request #13848 from AnturK/emplight
...
Fixes emp flashlight firing when storing it
2015-12-21 18:33:03 -03:00
e896742472
Merge pull request #13825 from MMMiracles/mapedits
...
Map Edits (snowdin, caves, z2, academy, ministation)
2015-12-21 15:45:12 -03: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
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
d3d582f0cb
Merge pull request #13821 from KorPhaeron/hog
...
Godstaff Fix
2015-12-21 13:41:22 +01: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
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
adc2fa3b03
Fixes Turrets
2015-12-21 00:12:17 -06: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
c00e773b6d
Merge pull request #13818 from LanCartwright/nukeopsrenovation
...
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
7d5f21259d
Changes c90gl to m90gl
2015-12-21 00:30:55 +00:00
c5106537ef
Merge pull request #13801 from bgobandit/hohohogod
...
Adds Christmas-related suicide messages.
2015-12-20 20:49:32 -03: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
a0923daa0e
Removes NOSHIELD
2015-12-20 15:21:58 -06: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
060ed21b7c
adds so much more shit
2015-12-20 20:59:23 +00:00
1a7c2a1eca
Fixes emp flashlight firing when storing it
2015-12-20 21:33:29 +01:00
10712f9553
Merge pull request #13804 from KorPhaeron/megaphone
...
Megaphone fix
2015-12-20 13:48:54 -06:00
bab0d21e5a
Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
...
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
2015-12-20 16:18:37 -03:00
ac576a5050
Doomsday countdown
2015-12-20 12:48:30 -06:00
e336acaa33
Voice changer friendly
2015-12-20 11:51:29 -06:00
72a601cdec
Merge pull request #13814 from AnturK/hogfix
...
Fixes HoG ghost image
2015-12-20 14:49:08 -03:00
1fc90a508c
Merge pull request #13808 from KorPhaeron/area_names
...
Fixes satellite secure storage name
2015-12-20 14:43:51 -03:00
dc5cb310d7
Merge pull request #13807 from KorPhaeron/cloak_of_shadows
...
Removes cloak of shadows
2015-12-20 10:56:27 -06:00
b7efa4ca3c
Nerfs the ultimate stealth weapon
2015-12-20 05:32:42 -06:00
00e322da3a
Fixes mounted chainsaws
2015-12-20 04:30:35 -06:00
bfced13c70
Doomsday Device
2015-12-20 02:23:42 -06:00
3ec4544123
adds a fix to touch attack hands getting loose from their owners
2015-12-20 02:15:38 -05:00
f85ee6f1b0
Merge pull request #13820 from LanCartwright/newchemsmoke
...
Adds Bioterror foam grenades V2
2015-12-20 04:13:29 -03:00
f0735982dc
Merge pull request #13799 from KorPhaeron/admin_items
...
Fixes Grey Tide exploits
2015-12-20 03:50:13 -03:00
1e7fcd3e9f
unbricks the rpgloot event.
...
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
8758ca1a72
various map edits
2015-12-19 22:27:40 -05:00
4136e49b2b
Makes stun batons respect shields upon hit
2015-12-19 22:05:35 -05:00
0c1855ea18
Merge pull request #13777 from Xhuis/totally_not_for_an_upcoming_project
...
Merges all things related to side-/mini-antagonists into a single folder
2015-12-19 23:24:33 -03:00
c01e4d10a4
Merge pull request #13792 from Incoming5643/isnt_one_tail_bad_enough
...
Fixes weird lizard feature issues
2015-12-19 23:17:09 -03:00
0d65351d3f
fixes
2015-12-19 17:51:11 -08:00
56be042744
fixes
2015-12-19 17:35:30 -08:00
tkdrg
Nerd Lord
Cheridan
KorPhaeron
Akke
phil235
KorPhaeron
xxalpha
AnturK
Incoming
MMMiracles
Xhuis
AndrewJacksonThe2nd