Commit Graph

22066 Commits

Author SHA1 Message Date
AnturK
7145db861f Fixes check antagonists not displaying bursted blobs 2015-12-21 20:08:05 +01:00
AnturK
8fd14d063e Makes ghost able to click on active teleporter 2015-12-21 20:08:05 +01:00
tkdrg
96855b3094 Merge pull request #13800 from KorPhaeron/voices
Prayer response voice is generalized again
2015-12-21 03:16:31 -03:00
tkdrg
9fe6d2bfce Merge pull request #13827 from The-Albinobigfoot/master
Flops can buy no-slips again.
2015-12-21 01:29:38 -03:00
tkdrg
c00e773b6d Merge pull request #13818 from LanCartwright/nukeopsrenovation
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
LanCartwright
ba18bebf48 missed this one 2015-12-21 00:40:20 +00:00
Akke
7d5f21259d Changes c90gl to m90gl 2015-12-21 00:30:55 +00:00
tkdrg
52d66c40a7 Merge pull request #13803 from KorPhaeron/sproink
Accelerator Rounds for sniper rifle
2015-12-20 20:58:21 -03:00
tkdrg
c5106537ef Merge pull request #13801 from bgobandit/hohohogod
Adds Christmas-related suicide messages.
2015-12-20 20:49:32 -03:00
tkdrg
181417723e Merge pull request #13816 from AnturK/bottopicfix
Fixes Bot topic checks
2015-12-20 20:45:49 -03:00
LanCartwright
b8bdc8fce3 merge error 2015-12-20 21:04:54 +00:00
LanCartwright
986bfc8501 merge error 2015-12-20 21:04:09 +00:00
Akke
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
Akke
060ed21b7c adds so much more shit 2015-12-20 20:59:23 +00:00
Cheridan
10712f9553 Merge pull request #13804 from KorPhaeron/megaphone
Megaphone fix
2015-12-20 13:48:54 -06:00
tkdrg
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
The-Albinobigfoot
0e738e34b9 A Modest Proposal. 2015-12-20 11:03:31 -08:00
KorPhaeron
ac576a5050 Doomsday countdown 2015-12-20 12:48:30 -06:00
AnturK
879bb6c0c0 A bit more sensible solution 2015-12-20 19:36:40 +01:00
KorPhaeron
e3b00e6939 Proper magazine name 2015-12-20 11:52:01 -06:00
KorPhaeron
e336acaa33 Voice changer friendly 2015-12-20 11:51:29 -06:00
tkdrg
72a601cdec Merge pull request #13814 from AnturK/hogfix
Fixes HoG ghost image
2015-12-20 14:49:08 -03:00
tkdrg
b1df9dfd89 Merge pull request #13810 from AnturK/anomalyfix
Fixes anomalies spawning same place
2015-12-20 14:44:30 -03:00
tkdrg
1fc90a508c Merge pull request #13808 from KorPhaeron/area_names
Fixes satellite secure storage name
2015-12-20 14:43:51 -03:00
tkdrg
cc6f005a3a Merge pull request #13806 from KorPhaeron/detective_buffs
Gun reskin (Detective) on alt click instead of left click
2015-12-20 14:43:27 -03:00
tkdrg
a73f3261b3 Merge pull request #13771 from AnturK/pipecrawl
Ventcrawling fixes
2015-12-20 14:23:55 -03:00
Cheridan
dc5cb310d7 Merge pull request #13807 from KorPhaeron/cloak_of_shadows
Removes cloak of shadows
2015-12-20 10:56:27 -06:00
AnturK
46a11b0542 Ventcrawling fixes 2015-12-20 11:15:13 +01:00
KorPhaeron
bfced13c70 Doomsday Device 2015-12-20 02:23:42 -06:00
tkdrg
f85ee6f1b0 Merge pull request #13820 from LanCartwright/newchemsmoke
Adds Bioterror foam grenades V2
2015-12-20 04:13:29 -03:00
tkdrg
f0735982dc Merge pull request #13799 from KorPhaeron/admin_items
Fixes Grey Tide exploits
2015-12-20 03:50:13 -03:00
Cheridan
bde3995bc1 Merge pull request #13790 from tkdrg/niggers
Fixes invisible mask exploits
2015-12-19 23:10:05 -06:00
The-Albinobigfoot
0992db8410 Flops can buy no-slips again.
I mean, seriously fam?

🆑
rscadd: The Syndicate recognizes that interfering with shipments of ultra-adhesive shoe wear in the name of galactic "balance" was a touch sadistic - Nuclear Operative families may now once again requisition no-slips.
/🆑
2015-12-19 20:41:31 -08:00
tkdrg
862f7e3510 Merge pull request #13775 from RemieRichards/get_turf_pixel+matrix_improvements
get_turf_pixel() improvements and matrix helpers
2015-12-19 23:26:44 -03:00
tkdrg
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
tkdrg
eae269d30a Merge pull request #13819 from KorPhaeron/deepstrike2
Assault Pod Fix
2015-12-19 23:21:50 -03:00
tkdrg
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
tkdrg
c75a038676 Merge pull request #13796 from KorPhaeron/AI_follow
Clicking the (F) link on AI speech while make you orbit their camera eye
2015-12-19 23:15:46 -03:00
tkdrg
df3fd0da7c Merge pull request #13258 from AndrewJacksonThe2nd/inventing_like_its_1891
Adds the Tesla Engine to the game.
2015-12-19 23:10:28 -03:00
KorPhaeron
c80b07d65e Trailing space 2015-12-19 20:08:08 -06:00
AndrewJacksonThe2nd
34733cf01c fuck shit pornhub 2015-12-19 18:01:05 -08:00
AndrewJacksonThe2nd
6207d9e052 haha whoooopppppppsssss 2015-12-19 17:52:06 -08:00
AndrewJacksonThe2nd
0d65351d3f fixes 2015-12-19 17:51:11 -08:00
AndrewJacksonThe2nd
56be042744 fixes 2015-12-19 17:35:30 -08:00
AndrewJacksonThe2nd
dabbb02297 Upgrades orbit to use remie's new features, fixes ball movement. 2015-12-19 16:38:32 -08:00
Cheridan
664245db99 Merge pull request #13791 from MrStonedOne/patch-91
Orbit fixes
2015-12-19 18:35:46 -06:00
LanCartwright
29ffdd90aa reverts mauler to previous price. 2015-12-20 00:16:53 +00:00
Akke
16f09a0bf8 bioterror grenades 2015-12-20 00:14:17 +00:00
KorPhaeron
dd2b645951 Assault Pod Fix 2015-12-19 18:13:29 -06:00
LanCartwright
d0c4089a33 whoops that was a mistake 2015-12-19 23:08:51 +00:00