Commit Graph
618 Commits
Author SHA1 Message Date
mwerezak defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak 53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
Chinsky 2359245f06 Merge pull request #9285 from mwerezak/master-fixes
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00
mwerezak d71a727131 remove_from_mob() considered harmful 2015-05-16 00:32:44 -04:00
mwerezak 5d620ff05b Span classes 2015-05-16 00:21:40 -04:00
mwerezak 3e41d6ff6e Fixes crossbow icon issue
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
2015-05-15 23:06:29 -04:00
mwerezak 65819302f3 Fixes #8986, one less object verb 2015-05-15 23:06:02 -04:00
mwerezak 29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
ccomp5950 19cc6df391 Conversion to admin_attack_log() 2015-05-15 17:07:07 -04:00
ccomp5950 735202d409 Admin log fix: Something that really annoys ravensdale.
<Ravensdale1> [X] has shot [y] with a the bullet

http://i.imgur.com/F54KjJ3.png
2015-05-14 21:07:36 -04:00
mwerezak aeb1f5ae68 Updates instances of if(cell.use(...)) 2015-05-14 01:52:04 -04:00
ccomp5950 569e785014 Holodeck items no longer spam admin attack logs.
/obj/items now has no_attack_log variable if set to 1, it won't log.

All holodeck items and lasertag weapons have no_attack_log set.

<3 Mangled
2015-05-11 22:11:46 -04:00
Kelenius 33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
PsiOmegaDelta f988545ed5 Merge pull request #8827 from comma/dev-freeze
Some fixes
2015-04-13 08:17:53 +02:00
Chinsky d6d005db6a Fixes #8550 2015-04-13 06:41:58 +03:00
Chinsky ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
mwerezak a560acd3da Makes reflex shooting more obvious
Reflex shooting now has a different colour than regular shooting, to prevent mixups
2015-04-02 21:54:35 -04:00
Zuhayr 84302ca204 Chinsky fix ur shit 2015-04-01 08:21:44 -07:00
PsiOmegaDelta 015fb291fa Merge pull request #8698 from mwerezak/gun-icons
Fixes swapped STS-35 item states
2015-04-01 06:32:29 +02:00
mwerezak 5fe486dfe3 Fixes swapped STS-35 item states
Renames the states to prevent future confusion
2015-03-31 20:26:31 -04:00
Zuhayr 299a977701 Merge pull request #8679 from Yoshax/tempgun
Fixes #8672
2015-03-31 15:17:47 +10:30
Zuhayr 3472513cf9 Merge pull request #8645 from mwerezak/gun-icons
Adds Skowron's inhand icons for various guns
2015-03-31 14:12:03 +10:30
Yosh 286dffcda0 Fixes #8672
Fixes #8672 however the temperature gun is still utterly and completely
useless, but hey, at least you can fire it now.
2015-03-30 21:59:59 +01:00
Chinsky c1b3e935d6 Backwards check fixed 2015-03-30 23:28:30 +03:00
Chinsky 246fc62b1c Whoops missed a bracket 2015-03-30 22:23:29 +03:00
Chinsky 1a93042226 Fixes #8548
Removed referenced to type of ammo used from descriptions.
2015-03-30 22:06:29 +03:00
Chinsky 40cf940f13 Fixes #8564 2015-03-30 22:04:13 +03:00
PsiOmegaDelta fefb55db93 Merge pull request #8674 from GinjaNinja32/rig_guns
Rig weapon fixes
2015-03-30 15:02:22 +02:00
GinjaNinja32 e342bf8a3a Fixes #8673, also makes some messages clearer and removes the twin cooldowns on rig weapons 2015-03-30 03:54:18 +01:00
mwerezak c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
mwerezak 36cf695256 Adds Skowron's inhand icons for various guns 2015-03-28 02:10:09 -04:00
Zuhayr 59adbae59e Removes the vox armalis. 2015-03-27 16:41:32 +10:30
mwerezak 8ff15108f9 Reduces 14.5mm ammo box cost to 2 TC, slight rename 2015-03-23 00:16:48 -04:00
mwerezak a60921326e Adjusts ammunition autolathe costs, makes 7.62 mags printable 2015-03-23 00:06:28 -04:00
mwerezak 6c794a8608 Fixes damage multiplier mixup, bumped var not being reset 2015-03-14 02:56:05 -04:00
mwerezak e6e0c87062 Aggressive grab auto hit only applies to close targets and melee attacks 2015-03-14 01:53:11 -04:00
mwerezak c4e4c77320 Having a neck grab on someone causes them to be hit by projectiles first instead of you.
If however the bullet misses or passes through the person being grabbed then it continues on and may still hit the person doing the grabbing.
2015-03-14 01:30:09 -04:00
mwerezak 812ff9869d Implements projectile point blank damage multipliers for targets being grabbed. 2015-03-14 00:41:55 -04:00
PsiOmega 533ccef0ab Robot code clean up and fixes.
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmegaDelta ff11ae9d54 Merge pull request #8426 from mwerezak/misc
Penetrating bullets are now more likely to go through glass doors
2015-03-10 09:26:11 +01:00
mwerezak 65a34943cd Penetrating bullets are now more likely to go through glass doors 2015-03-10 03:00:24 -04:00
mwerezak 645910947b Adds orderable flaregun crate
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04:00
mwerezak 91d7dd7049 Adjusts item_state placeholders
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
2015-03-09 15:39:24 -04:00
mwerezak 5abf0248fc Firing the Z8 grenade launch automatically switches back to regular firing. 2015-03-09 03:14:26 -04:00
Chinsky 07ee8424da Merge pull request #8371 from mwerezak/gun-rewrite
Edits Z8 desc
2015-03-06 11:56:31 +03:00
mwerezak 875f805724 Edits Z8 desc 2015-03-06 00:06:53 -05:00
mwerezakandmwerezak 8d1a92a0f5 Hardsuit tweaks
Spider fang blade uses power faster.
Light hardsuits (minus ninja suit) have voidsuit-level breach thresholds.
If the suit is malfunctioning when it runs out of power then you will need someone to cut you out.
2015-02-28 14:04:53 -05:00
mwerezak a026922115 More hardsuit fixes, ion rifle fix
Fixes modules being usable when destroyed.
Fixes charge display for fractional charge values.
Fixes ion rifles EMPing themselves.
2015-02-28 04:15:29 -05:00
mwerezak 7dd82f8763 Merge remote-tracking branch 'upstream/dev-freeze' into backup
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
2015-02-28 03:39:38 -05:00