Commit Graph

12529 Commits

Author SHA1 Message Date
tkdrg
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
tkdrg
c9ad9af2c5 Merge pull request #13809 from AnturK/ghosthudpref
Makes Ghost HUD toggle persistent
2015-12-21 14:36:19 -03:00
tkdrg
1074e7d161 Merge pull request #13831 from KorPhaeron/dual_wield
Dual wielding guns
2015-12-21 14:11:09 -03:00
AnturK
31a89ff320 Makes inquisitiveness client preference 2015-12-21 17:28:36 +01:00
tkdrg
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
tkdrg
96855b3094 Merge pull request #13800 from KorPhaeron/voices
Prayer response voice is generalized again
2015-12-21 03:16:31 -03:00
Incoming5643
72a5c2d604 why am I editing in the browser this is terrible 2015-12-21 01:11:29 -05:00
Incoming5643
cda01d1457 he's right 2015-12-21 01:10:37 -05:00
tkdrg
c00e773b6d Merge pull request #13818 from LanCartwright/nukeopsrenovation
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
tkdrg
52d66c40a7 Merge pull request #13803 from KorPhaeron/sproink
Accelerator Rounds for sniper rifle
2015-12-20 20:58:21 -03:00
tkdrg
181417723e Merge pull request #13816 from AnturK/bottopicfix
Fixes Bot topic checks
2015-12-20 20:45:49 -03:00
xxalpha
8d586cef49 Adds a bottle of drying agent spray to janiborg. 2015-12-20 21:57:43 +00:00
KorPhaeron
37a7699bc9 Harm intent only 2015-12-20 15:28:29 -06: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
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
AnturK
879bb6c0c0 A bit more sensible solution 2015-12-20 19:36:40 +01:00
KorPhaeron
bcb1f84360 Runs the implant_check for off_hand guns 2015-12-20 12:06:35 -06:00
KorPhaeron
e3b00e6939 Proper magazine name 2015-12-20 11:52:01 -06:00
tkdrg
b1df9dfd89 Merge pull request #13810 from AnturK/anomalyfix
Fixes anomalies spawning same place
2015-12-20 14:44:30 -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
AnturK
46a11b0542 Ventcrawling fixes 2015-12-20 11:15:13 +01:00
KorPhaeron
bfced13c70 Doomsday Device 2015-12-20 02:23:42 -06:00
KorPhaeron
dbcb8dd58a Less copypaste 2015-12-20 00:46:51 -06:00
KorPhaeron
eeb2653070 Dual Wield 2015-12-20 00:22:35 -06:00
Incoming
1e7fcd3e9f unbricks the rpgloot event.
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
Cheridan
bde3995bc1 Merge pull request #13790 from tkdrg/niggers
Fixes invisible mask exploits
2015-12-19 23:10:05 -06: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
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
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
dabbb02297 Upgrades orbit to use remie's new features, fixes ball movement. 2015-12-19 16:38:32 -08:00
LanCartwright
9db11ae0b9 Update projectile.dm 2015-12-19 22:56:10 +00:00
Cheridan
450b7ebd1a Merge pull request #13763 from AnturK/medfix
Medbeam Fixes
2015-12-19 16:55:14 -06:00
Akke
3818c227d2 For a 60 crew round, this theoretically allows all operatives to own a gun and some ammo, and still have some points left over for luxuries.
This mainly balances gun prices and adds new bundles
2015-12-19 22:44:49 +00:00
AndrewJacksonThe2nd
5fd85edfb1 Energy ball no longer claims it is a singularity. 2015-12-19 13:04:16 -08:00
AnturK
5e45b7efd0 Fixes bot topic checks 2015-12-19 21:47:07 +01:00
AndrewJacksonThe2nd
1ab5e80458 Tesla map removal to fix merge 2015-12-19 12:32:50 -08:00
AndrewJacksonThe2nd
21165f77f5 i heard that sleep in process is a bad idea 2015-12-19 12:27:42 -08:00
AndrewJacksonThe2nd
0037ab3337 removes debug messages 2015-12-19 12:27:40 -08:00
AndrewJacksonThe2nd
7881d26981 WHOOPS FORGOT TO REVERT THIS 2015-12-19 12:27:37 -08:00
AndrewJacksonThe2nd
9582db7247 Adds the Tesla Engine to the game. 2015-12-19 12:27:32 -08:00
Cheridan
52d30c8870 Merge pull request #13761 from KorPhaeron/prayers
Admins can claim prayers
2015-12-19 11:48:11 -06:00
AnturK
b1fe29f73d What is OOP 2015-12-19 15:32:15 +01:00
AnturK
f5a57b5ced Fixes anomalies spawning same place 2015-12-19 15:30:23 +01:00
AnturK
3c26d125a7 Makes Ghost HUD toggle persistent 2015-12-19 15:26:14 +01:00